diff options
| author | shennetsind <ind@henn.et> | 2013-11-06 15:10:35 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-06 15:10:35 -0200 |
| commit | 6f77d070b98c73962a4f45f274a0f5c58a2448e3 (patch) | |
| tree | 4fa9aa479472fc6cf37803c32df0ad684994b1e5 /src/map/mercenary.c | |
| parent | 778facb21f822cea549939c8dbee886e1cd342aa (diff) | |
| download | hercules-6f77d070b98c73962a4f45f274a0f5c58a2448e3.tar.gz hercules-6f77d070b98c73962a4f45f274a0f5c58a2448e3.tar.bz2 hercules-6f77d070b98c73962a4f45f274a0f5c58a2448e3.tar.xz hercules-6f77d070b98c73962a4f45f274a0f5c58a2448e3.zip | |
Modified status_calc_
Replaces the previous 'first' flag with a multi-option flag capable of selectively determining calls where the recalculation must not be hold by delayed damage, and therefore must take place immediately.
This fixes issues caused by actions that require immediate recalculation e.g. on-level-up max_hp update, also modified @baselevel where status_calc was being called after the heal and not before, causing it not to be fully healed.
Special Thanks to Haruna! <3
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/mercenary.c')
| -rw-r--r-- | src/map/mercenary.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c index 8c74a5e1e..5ea10dc66 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -317,7 +317,7 @@ int merc_data_received(struct s_mercenary *merc, bool flag) { md->bl.y = md->ud.to_y; map->addiddb(&md->bl); - status_calc_mercenary(md,1); + status_calc_mercenary(md,SCO_FIRST); md->contract_timer = INVALID_TIMER; merc_contract_init(md); } |