From aa5e2a517c8779db600a3015df5eea56d3a13c92 Mon Sep 17 00:00:00 2001 From: Lance Date: Sat, 20 May 2006 15:17:18 +0000 Subject: * grfio_final moved back (with condition) if any of GRF overriding is enabled so servers with such configuration will not have different values after reloading. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6667 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/map.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/map/map.c') 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); -- cgit v1.2.3-60-g2f50