diff options
| author | Haru <haru@dotalux.com> | 2020-06-28 16:44:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-28 16:44:57 +0200 |
| commit | 44e53924b3db97b515f9a2e032580be0d5ed433c (patch) | |
| tree | 75457e95ce923ea8a39250dcb79885b1de58eba9 /src/map | |
| parent | 8fdc97b3d38d938a610795b8477c2d49deea0f5c (diff) | |
| parent | e3e1acb092a5ba8ddc4dcb116ec4bcf7686e140d (diff) | |
| download | hercules-44e53924b3db97b515f9a2e032580be0d5ed433c.tar.gz hercules-44e53924b3db97b515f9a2e032580be0d5ed433c.tar.bz2 hercules-44e53924b3db97b515f9a2e032580be0d5ed433c.tar.xz hercules-44e53924b3db97b515f9a2e032580be0d5ed433c.zip | |
Merge pull request #2778 from 4144/extendci
Extend ci with more checks and add different fixes
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/battle.c | 2 | ||||
| -rw-r--r-- | src/map/map.c | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index bea1c7ab2..ea00f938f 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -7688,6 +7688,8 @@ static void do_init_battle(bool minimal) static void do_final_battle(void) { + if (map->minimal) + return; ers_destroy(battle->delay_damage_ers); } diff --git a/src/map/map.c b/src/map/map.c index 24d571498..3312680da 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -6691,6 +6691,8 @@ int do_init(int argc, char *argv[]) atcommand->msg_read(map->MSG_CONF_NAME, false); map->inter_config_read(map->INTER_CONF_NAME, false); logs->config_read(map->LOG_CONF_NAME, false); + } else { + battle->config_read(map->BATTLE_CONF_FILENAME, false); } script->config_read(map->SCRIPT_CONF_NAME, false); @@ -6741,8 +6743,8 @@ int do_init(int argc, char *argv[]) timer->add_func_list(map->removemobs_timer, "map_removemobs_timer"); timer->add_interval(timer->gettick()+1000, map->freeblock_timer, 0, 0, 60*1000); - HPM->event(HPET_INIT); } + HPM->event(HPET_INIT); atcommand->init(minimal); battle->init(minimal); @@ -6789,8 +6791,12 @@ int do_init(int argc, char *argv[]) exit(EXIT_SUCCESS); } - if( minimal ) { + if (minimal) { HPM->event(HPET_READY); + HPM->event(HPET_FINAL); + battle->final(); + HPM_map_do_final(); + HPM->event(HPET_POST_FINAL); exit(EXIT_SUCCESS); } |