diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2013-02-03 23:23:44 +0800 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2013-02-03 23:23:44 +0800 |
| commit | 7a20f13a210f395b8276cb19583e0b302f4f6a1f (patch) | |
| tree | 4a0dd554aa88f68f97f5d9f9676d23d1cfc9da15 /src/map/battle.c | |
| parent | 7626b141f8e56b1739abce76f5a99cbbb2b4b159 (diff) | |
| parent | 24d6aba263ff25724b8e6c9d6a228bba9fd6e756 (diff) | |
| download | hercules-7a20f13a210f395b8276cb19583e0b302f4f6a1f.tar.gz hercules-7a20f13a210f395b8276cb19583e0b302f4f6a1f.tar.bz2 hercules-7a20f13a210f395b8276cb19583e0b302f4f6a1f.tar.xz hercules-7a20f13a210f395b8276cb19583e0b302f4f6a1f.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 2198b25ec..4505b6a63 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -808,13 +808,12 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damag * in RE, SW possesses a lifetime equal to 3 times the caster's health **/ #ifdef RENEWAL + d->dmg_lv = ATK_BLOCK; if ( ( group->val2 - damage) > 0 ) { group->val2 -= damage; - d->dmg_lv = ATK_BLOCK; - return 0; } else - damage -= group->val2; - skill_delunitgroup(group); + skill_delunitgroup(group); + return 0; #else if (--group->val2<=0) skill_delunitgroup(group); |