Pārlūkot izejas kodu

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

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12957 54d463be-8e91-2dee-dedb-b68131a5f0ec
ultramage 17 gadi atpakaļ
vecāks
revīzija
1d9c99dc72
3 mainītis faili ar 7 papildinājumiem un 2 dzēšanām
  1. 1 0
      Changelog-Trunk.txt
  2. 3 1
      src/char/char.c
  3. 3 1
      src/char/inter.c

+ 1 - 0
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

+ 3 - 1
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);

+ 3 - 1
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