diff options
| author | shennetsind <ind@henn.et> | 2013-11-06 21:23:31 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-06 21:23:31 -0200 |
| commit | d56017e3d1bf783cfdc67a702d2b70a0a27c8863 (patch) | |
| tree | a47bd0ef6340ce1d011d198f430c7d96d620afe0 /src/map/battle.c | |
| parent | 5c94e76753c0cdb4ffb7dabbd6e135f1f7d42ef2 (diff) | |
| parent | 3a3d2297068809d25ca43e19fd2977f97b2728f5 (diff) | |
| download | hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.gz hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.bz2 hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.xz hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.zip | |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/pc.c
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 94222f663..9a70acaca 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -206,7 +206,7 @@ int battle_delay_damage_sub(int tid, int64 tick, int id, intptr_t data) { if( !target || status->isdead(target) ) {/* nothing we can do */ if( dat->src_type == BL_PC && ( src = map->id2bl(dat->src_id) ) && --((TBL_PC*)src)->delayed_damage == 0 && ((TBL_PC*)src)->state.hold_recalc ) { ((TBL_PC*)src)->state.hold_recalc = 0; - status_calc_pc(((TBL_PC*)src),0); + status_calc_pc(((TBL_PC*)src),SCO_FORCE); } ers_free(battle->delay_damage_ers, dat); return 0; @@ -237,7 +237,7 @@ int battle_delay_damage_sub(int tid, int64 tick, int id, intptr_t data) { if( src && src->type == BL_PC && --((TBL_PC*)src)->delayed_damage == 0 && ((TBL_PC*)src)->state.hold_recalc ) { ((TBL_PC*)src)->state.hold_recalc = 0; - status_calc_pc(((TBL_PC*)src),0); + status_calc_pc(((TBL_PC*)src),SCO_FORCE); } } ers_free(battle->delay_damage_ers, dat); @@ -6759,7 +6759,10 @@ int battle_config_read(const char* cfgName) return 0; } -void do_init_battle(void) { +void do_init_battle(bool minimal) { + if (minimal) + return; + battle->delay_damage_ers = ers_new(sizeof(struct delay_damage),"battle.c::delay_damage_ers",ERS_OPT_CLEAR); timer->add_func_list(battle->delay_damage_sub, "battle_delay_damage_sub"); |