diff options
| author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-26 11:13:39 +0000 |
|---|---|---|
| committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-26 11:13:39 +0000 |
| commit | 81d811f3c35d37e358f6874dd702923a0a934275 (patch) | |
| tree | 1cd3966f751bfa6924f5bcb47fc7ec73bee0f0c7 /src/map/skill.c | |
| parent | 0aebc2311a3167c5f261f78ff7ab89a4b25a2ddb (diff) | |
| download | hercules-81d811f3c35d37e358f6874dd702923a0a934275.tar.gz hercules-81d811f3c35d37e358f6874dd702923a0a934275.tar.bz2 hercules-81d811f3c35d37e358f6874dd702923a0a934275.tar.xz hercules-81d811f3c35d37e358f6874dd702923a0a934275.zip | |
- Implemented official Convex Mirror (With help of Yomanda and Sirius White)
- Fixed SC_WARN don't receiving reflecting damage (Bug Report 1854).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12997 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index d817e5eba..178a946c1 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1471,8 +1471,8 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds if( (skillid == AL_INCAGI || skillid == AL_BLESSING) && tsd->sc.data[SC_CHANGEUNDEAD] ) damage = 1; - if (damage > 0 && dmg.flag&BF_WEAPON && src != bl && src == dsrc && - skillid != WS_CARTTERMINATION) // FIXME(?): Quick and dirty check, but HSCR does bypass Shield Reflect... so I make it bypass the whole reflect thing [DracoRPG] + if( damage > 0 && dmg.flag&BF_WEAPON && src != bl && ( src == dsrc || ( dsrc->type == BL_SKILL && ( skillid == SG_SUN_WARM || skillid == SG_MOON_WARM || skillid == SG_STAR_WARM ) ) ) + && skillid != WS_CARTTERMINATION ) rdamage = battle_calc_return_damage(bl, damage, dmg.flag); //Skill hit type |