Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected wrong data loading order in txt storage code causing crashes at startup (followup to r12950).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12957 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2008-07-15 01:50:06 +00:00
parent 47ee54852d
commit 1d9c99dc72
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -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. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/07/15 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 * 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] and protected timer functions against improper use. (should fix bugreport:1833 bugreport:1841) [FlavioJS]
2008/07/14 2008/07/14

4
src/char/char.c
View File

@ -4299,6 +4299,9 @@ int do_init(int argc, char **argv)
ShowInfo("Finished reading the char-server configuration.\n"); ShowInfo("Finished reading the char-server configuration.\n");
inter_init_txt((argc > 2) ? argv[2] : inter_cfgName); // inter server <20>‰Šú‰»
ShowInfo("Finished reading the inter-server configuration.\n");
// a newline in the log... // a newline in the log...
char_log(""); char_log("");
// moved behind char_config_read in case we changed the filename [celest] // 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 #ifdef ENABLE_SC_SAVING
status_init(); status_init();
#endif #endif
inter_init_txt((argc > 2) ? argv[2] : inter_cfgName); // inter server <20>‰Šú‰»
ShowInfo("char server initialized.\n"); ShowInfo("char server initialized.\n");
set_defaultparse(parse_char); set_defaultparse(parse_char);

4
src/char/inter.c
View File

@ -253,8 +253,10 @@ int inter_save(void) {
return 0; return 0;
} }
#endif //TXT_SQL_CONVERT #endif //TXT_SQL_CONVERT
// <20>‰Šú‰» // <20>‰Šú‰»
int inter_init_txt(const char *file) { int inter_init_txt(const char *file)
{
inter_config_read(file); inter_config_read(file);
#ifndef TXT_SQL_CONVERT #ifndef TXT_SQL_CONVERT