diff options
| author | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-20 15:17:18 +0000 |
|---|---|---|
| committer | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-20 15:17:18 +0000 |
| commit | aa5e2a517c8779db600a3015df5eea56d3a13c92 (patch) | |
| tree | 08373e5d5f57f6d2ef1e66f2db445063a26c7286 /src/map/map.c | |
| parent | 1d25d772185f5b6e6d099ac07294fc7f9b2b3374 (diff) | |
| download | hercules-aa5e2a517c8779db600a3015df5eea56d3a13c92.tar.gz hercules-aa5e2a517c8779db600a3015df5eea56d3a13c92.tar.bz2 hercules-aa5e2a517c8779db600a3015df5eea56d3a13c92.tar.xz hercules-aa5e2a517c8779db600a3015df5eea56d3a13c92.zip | |
* 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
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 17 |
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); |