diff options
| author | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-24 03:40:07 +0000 |
|---|---|---|
| committer | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-24 03:40:07 +0000 |
| commit | 740ae24edcbf817163b32827fcf1ac9ca3a84965 (patch) | |
| tree | 58ca3d1421d7e41dbc1d959434ea19bc5366f848 /src/map/skill.c | |
| parent | d45ade4f3228c8ea6d1bfecebdeb6686699980bd (diff) | |
| download | hercules-740ae24edcbf817163b32827fcf1ac9ca3a84965.tar.gz hercules-740ae24edcbf817163b32827fcf1ac9ca3a84965.tar.bz2 hercules-740ae24edcbf817163b32827fcf1ac9ca3a84965.tar.xz hercules-740ae24edcbf817163b32827fcf1ac9ca3a84965.zip | |
Follow up r16486 a little code optimization and fixed its server crashing/halting tendency.
Follow up r16483 fixed a duplicate display animation of traps when triggered by a skill.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16487 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 2eb778f8c..4ff1dded8 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2387,7 +2387,9 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds case RA_CLUSTERBOMB: case RA_FIRINGTRAP: case RA_ICEBOUNDTRAP: - clif_skill_damage((bl->type==BL_PC)?dsrc:src,bl,tick, dmg.amotion, dmg.dmotion, damage, dmg.div_, skillid,flag&SD_LEVEL?-1:skilllv, 5); + dmg.dmotion = clif_skill_damage(src,bl,tick, dmg.amotion, dmg.dmotion, damage, dmg.div_, skillid,flag&SD_LEVEL?-1:skilllv, 5); + if( dsrc != src ) // avoid damage display redundancy + break; case HT_LANDMINE: dmg.dmotion = clif_skill_damage(dsrc,bl,tick, dmg.amotion, dmg.dmotion, damage, dmg.div_, skillid, -1, type); break; |