diff options
| author | Haru <haru@dotalux.com> | 2018-04-08 18:39:33 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2018-11-14 18:44:17 +0100 |
| commit | cd634fbcefaa36bb9d05b0be071f8f23d408ea26 (patch) | |
| tree | ee77b7469d8525bd6472a3d0931accfbee0ec7a9 /src/map/battle.c | |
| parent | 86b70dc7ea0a6d3aee6d99a0f802668fc9a0eb75 (diff) | |
| download | hercules-cd634fbcefaa36bb9d05b0be071f8f23d408ea26.tar.gz hercules-cd634fbcefaa36bb9d05b0be071f8f23d408ea26.tar.bz2 hercules-cd634fbcefaa36bb9d05b0be071f8f23d408ea26.tar.xz hercules-cd634fbcefaa36bb9d05b0be071f8f23d408ea26.zip | |
Use an enum as flag for status->heal() and related functions
This introduces the `enum status_heal_flag`. No functional changes are
made.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index ee9662c33..652453bf0 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2872,7 +2872,7 @@ static int64 battle_calc_damage(struct block_list *src, struct block_list *bl, s if( sc->data[SC__MAELSTROM] && (flag&BF_MAGIC) && skill_id && (skill->get_inf(skill_id)&INF_GROUND_SKILL) ) { // {(Maelstrom Skill LevelxAbsorbed Skill Level)+(Caster's Job/5)}/2 int sp = (sc->data[SC__MAELSTROM]->val1 * skill_lv + (t_sd ? t_sd->status.job_level / 5 : 0)) / 2; - status->heal(bl, 0, sp, 3); + status->heal(bl, 0, sp, STATUS_HEAL_FORCED | STATUS_HEAL_SHOWEFFECT); d->dmg_lv = ATK_BLOCK; return 0; } @@ -3243,7 +3243,7 @@ static int64 battle_calc_damage(struct block_list *src, struct block_list *bl, s //(since battle_drain is strictly for players currently) if ((sce=sc->data[SC_HAMI_BLOODLUST]) && flag&BF_WEAPON && damage > 0 && rnd()%100 < sce->val3) - status->heal(src, damage*sce->val4/100, 0, 3); + status->heal(src, damage*sce->val4/100, 0, STATUS_HEAL_FORCED | STATUS_HEAL_SHOWEFFECT); if( (sce = sc->data[SC_FORCEOFVANGUARD]) && flag&BF_WEAPON && rnd()%100 < sce->val2 && sc->fv_counter <= sce->val3 ) @@ -6094,7 +6094,7 @@ static void battle_drain(struct map_session_data *sd, struct block_list *tbl, in if (!thp && !tsp) return; - status->heal(&sd->bl, thp, tsp, battle_config.show_hp_sp_drain ? 3 : 1); + status->heal(&sd->bl, thp, tsp, STATUS_HEAL_FORCED | (battle_config.show_hp_sp_drain ? STATUS_HEAL_SHOWEFFECT : STATUS_HEAL_DEFAULT)); if (rhp || rsp) status_zap(tbl, rhp, rsp); |