diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-17 16:23:44 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-17 16:23:44 +0000 |
| commit | 6ed22f13e76053ac76e0c74a01b62330c7331b71 (patch) | |
| tree | 32584f96e0b9396ddec2a5164d860756146955f3 /src/map/skill.c | |
| parent | c6928fbf500652f9bf894176acbe9cff93199442 (diff) | |
| download | hercules-6ed22f13e76053ac76e0c74a01b62330c7331b71.tar.gz hercules-6ed22f13e76053ac76e0c74a01b62330c7331b71.tar.bz2 hercules-6ed22f13e76053ac76e0c74a01b62330c7331b71.tar.xz hercules-6ed22f13e76053ac76e0c74a01b62330c7331b71.zip | |
Fixed bShortWeaponDamage to work against cart termination, bugreport:5328
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15593 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 79b2af129..31b4045ea 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2054,9 +2054,9 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds skillid == MER_INCAGI || skillid == MER_BLESSING) && tsd->sc.data[SC_CHANGEUNDEAD] ) damage = 1; - 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) || (sc && sc->data[SC_REFLECTDAMAGE])) ) - rdamage = battle_calc_return_damage(bl,src, &damage, dmg.flag); + 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 ) ) )) + || (sc && sc->data[SC_REFLECTDAMAGE])) ) + rdamage = battle_calc_return_damage(bl,src, &damage, dmg.flag, skillid); //Skill hit type type=(skillid==0)?5:skill_get_hit(skillid); |