summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-20 15:08:31 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-20 15:08:31 +0000
commit1d25d772185f5b6e6d099ac07294fc7f9b2b3374 (patch)
tree0027dd75e78680d9f1f653d92f22cb1cbbc2d070
parentf5c3250ad6d0801dfe2249370246418867f48187 (diff)
downloadhercules-1d25d772185f5b6e6d099ac07294fc7f9b2b3374.tar.gz
hercules-1d25d772185f5b6e6d099ac07294fc7f9b2b3374.tar.bz2
hercules-1d25d772185f5b6e6d099ac07294fc7f9b2b3374.tar.xz
hercules-1d25d772185f5b6e6d099ac07294fc7f9b2b3374.zip
* grfio_final moved back to do_final since it's used by @reloaditemdb.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6666 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/map.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 48c2a956e..f49a2b296 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/05/19
+ * grfio_final moved back to do_final since it's used by @reloaditemdb. [Lance]
* jA1983 script.c buildin_menu fix. Thanks to End_of_exam. [Lance]
* Abit of alterations to login-server. [Lance]
2006/05/19
diff --git a/src/map/map.c b/src/map/map.c
index 5dc4d25ba..b67530390 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3658,7 +3658,7 @@ 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();
+ grfio_final(); // Reverted since itemdb refresh needs it temperory.
for (i = 0; i < map_num; i++)
if (map[i].m >= 0)
@@ -3950,7 +3950,7 @@ 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.
+ //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 =