summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/map/map.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/map/map.c b/src/map/map.c
index b67530390..350cba4a0 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3658,7 +3658,9 @@ void do_final(void) {
//map_cache_close();
// We probably don't need the grfio after server bootup 'yet' too. So this is closed near the end of do_init [Lance]
- grfio_final(); // Reverted since itemdb refresh needs it temperory.
+ if((battle_config.cardillust_read_grffile || battle_config.item_equip_override_grffile ||
+ battle_config.item_slots_override_grffile || battle_config.item_name_override_grffile))
+ grfio_final();
for (i = 0; i < map_num; i++)
if (map[i].m >= 0)
@@ -3950,12 +3952,15 @@ int do_init(int argc, char *argv[]) {
if (battle_config.pk_mode == 1)
ShowNotice("Server is running on '"CL_WHITE"PK Mode"CL_RESET"'.\n");
- //grfio_final(); // Unused after reading all maps.
+ if(!(battle_config.cardillust_read_grffile || battle_config.item_equip_override_grffile ||
+ battle_config.item_slots_override_grffile || battle_config.item_name_override_grffile))
+ grfio_final(); // Unused after reading all maps.
+
//However, some reload functions still use it,disable them.
- battle_config.cardillust_read_grffile =
- battle_config.item_equip_override_grffile =
- battle_config.item_slots_override_grffile =
- battle_config.item_name_override_grffile = 0;
+ //battle_config.cardillust_read_grffile =
+ //battle_config.item_equip_override_grffile =
+ //battle_config.item_slots_override_grffile =
+ //battle_config.item_name_override_grffile = 0;
ShowStatus("Server is '"CL_GREEN"ready"CL_RESET"' and listening on port '"CL_WHITE"%d"CL_RESET"'.\n\n", map_port);