diff options
| author | shennetsind <ind@henn.et> | 2013-11-06 21:10:52 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-06 21:10:52 -0200 |
| commit | aaf34515fa9d32fae10c71b5b3f615857fd7e55e (patch) | |
| tree | bec3964580ead4ed1d45f7bf51b418753004f16b /src/map/battle.c | |
| parent | eaf04b9a2f0b399027df251c5d19d58d74e24e6a (diff) | |
| parent | 87d7348396af97428638723ae49ca2ff166e4acd (diff) | |
| download | hercules-aaf34515fa9d32fae10c71b5b3f615857fd7e55e.tar.gz hercules-aaf34515fa9d32fae10c71b5b3f615857fd7e55e.tar.bz2 hercules-aaf34515fa9d32fae10c71b5b3f615857fd7e55e.tar.xz hercules-aaf34515fa9d32fae10c71b5b3f615857fd7e55e.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 499b7e3a0..9a70acaca 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -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"); |