diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-15 01:50:06 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-15 01:50:06 +0000 |
| commit | b4666cfe7d5c1b601cbf3beb43058a1574c9ad03 (patch) | |
| tree | 659017f40e470897916bea0c1f474004c7eb2184 | |
| parent | 5f432aa0e316f5afb293f25f3e74c79a23a661f4 (diff) | |
| download | hercules-b4666cfe7d5c1b601cbf3beb43058a1574c9ad03.tar.gz hercules-b4666cfe7d5c1b601cbf3beb43058a1574c9ad03.tar.bz2 hercules-b4666cfe7d5c1b601cbf3beb43058a1574c9ad03.tar.xz hercules-b4666cfe7d5c1b601cbf3beb43058a1574c9ad03.zip | |
Corrected wrong data loading order in txt storage code causing crashes at startup (followup to r12950).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12957 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/char/char.c | 4 | ||||
| -rw-r--r-- | src/char/inter.c | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 2320521b5..7f60e61f7 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. 2008/07/15 + * Corrected wrong data loading order in txt storage code [ultramage] * Fixed pop_timer_heap using max heap comparisons instead of min heap comparisons and protected timer functions against improper use. (should fix bugreport:1833 bugreport:1841) [FlavioJS] 2008/07/14 diff --git a/src/char/char.c b/src/char/char.c index 19887b737..071e21472 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -4299,6 +4299,9 @@ int do_init(int argc, char **argv) ShowInfo("Finished reading the char-server configuration.\n"); + inter_init_txt((argc > 2) ? argv[2] : inter_cfgName); // inter server 初期化 + ShowInfo("Finished reading the inter-server configuration.\n"); + // a newline in the log... char_log(""); // moved behind char_config_read in case we changed the filename [celest] @@ -4312,7 +4315,6 @@ int do_init(int argc, char **argv) #ifdef ENABLE_SC_SAVING status_init(); #endif - inter_init_txt((argc > 2) ? argv[2] : inter_cfgName); // inter server 初期化 ShowInfo("char server initialized.\n"); set_defaultparse(parse_char); diff --git a/src/char/inter.c b/src/char/inter.c index c987ce8f2..463d2dd4d 100644 --- a/src/char/inter.c +++ b/src/char/inter.c @@ -253,8 +253,10 @@ int inter_save(void) { return 0; } #endif //TXT_SQL_CONVERT + // 初期化 -int inter_init_txt(const char *file) { +int inter_init_txt(const char *file) +{ inter_config_read(file); #ifndef TXT_SQL_CONVERT |