diff options
| author | Haru <haru@dotalux.com> | 2020-05-27 13:25:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 13:25:14 +0200 |
| commit | f828dfdbcafc8387afbcce11f2b951beb859d281 (patch) | |
| tree | 55ebc041fd3e814c34061730d6a6759115d66c59 /src/map/battle.c | |
| parent | cc4956cb356e61eeab85431a07746a70c6348f19 (diff) | |
| parent | 37f693585407e9282f24cb7f1166ce0898441934 (diff) | |
| download | hercules-f828dfdbcafc8387afbcce11f2b951beb859d281.tar.gz hercules-f828dfdbcafc8387afbcce11f2b951beb859d281.tar.bz2 hercules-f828dfdbcafc8387afbcce11f2b951beb859d281.tar.xz hercules-f828dfdbcafc8387afbcce11f2b951beb859d281.zip | |
Merge pull request #2736 from Kenpachi2k13/ancient_bug_3504
Remove misleading debug code for nonexistent skill unit group when ending SC_DANCING
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index c8cd71b94..a8193d24a 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2832,18 +2832,18 @@ static int64 battle_calc_damage(struct block_list *src, struct block_list *bl, s d->dmg_lv = ATK_BLOCK; if(src_skill_id == MH_STEINWAND){ if (--group->val2<=0) - skill->del_unitgroup(group,ALC_MARK); + skill->del_unitgroup(group); if( (group->val3 - damage) > 0 ) group->val3 -= (int)cap_value(damage, INT_MIN, INT_MAX); else - skill->del_unitgroup(group,ALC_MARK); + skill->del_unitgroup(group); return 0; } if( skill_id == SO_ELEMENTAL_SHIELD ) { if ( ( group->val2 - damage) > 0 ) { group->val2 -= (int)cap_value(damage,INT_MIN,INT_MAX); } else - skill->del_unitgroup(group,ALC_MARK); + skill->del_unitgroup(group); return 0; } /** @@ -2853,12 +2853,12 @@ static int64 battle_calc_damage(struct block_list *src, struct block_list *bl, s if ( ( group->val2 - damage) > 0 ) { group->val2 -= (int)cap_value(damage,INT_MIN,INT_MAX); } else - skill->del_unitgroup(group,ALC_MARK); + skill->del_unitgroup(group); if (--group->val3<=0) - skill->del_unitgroup(group,ALC_MARK); + skill->del_unitgroup(group); #else if (--group->val2<=0) - skill->del_unitgroup(group,ALC_MARK); + skill->del_unitgroup(group); #endif return 0; } |