summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-29 18:03:36 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-29 18:03:36 +0000
commit91972018ab136548f849d64f504a11b4f3651797 (patch)
tree4ab8f6be954b97a0a11fb5d5fcb8dbb99893f438
parentc564f3eec31ecbe18bd0e9956457818e59e32b60 (diff)
downloadhercules-91972018ab136548f849d64f504a11b4f3651797.tar.gz
hercules-91972018ab136548f849d64f504a11b4f3651797.tar.bz2
hercules-91972018ab136548f849d64f504a11b4f3651797.tar.xz
hercules-91972018ab136548f849d64f504a11b4f3651797.zip
* Fixed SQL char server crashing when loading the item_db
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1336 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-SVN.txt1
-rw-r--r--src/char_sql/char.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt
index 7b618c145..7b64e4aa6 100644
--- a/Changelog-SVN.txt
+++ b/Changelog-SVN.txt
@@ -6,6 +6,7 @@ Date Added
upgrade your mysql as a result of the new adoption system. Thank you
-MouseJstr
+ * Fixed SQL char server crashing when loading the item_db, my bad ^^; [celest]
* More ANSI C++/C conformance fixes [SVN 1334: MouseJstr]
* Added auto save guild data (only guardian HP and owner guild ID for now,
both cached) every 5 minutes during WOE [celest]
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 75bf663d0..f8f083e85 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -3438,12 +3438,12 @@ int do_init(int argc, char **argv){
printf("charserver configuration reading done.....\n");
- //Read ItemDB
- do_init_itemdb();
-
inter_init((argc > 2) ? argv[2] : inter_cfgName); // inter server ÃʱâÈ­
printf("interserver configuration reading done.....\n");
+ //Read ItemDB
+ do_init_itemdb();
+
printf("start char server initializing.....\n");
mmo_char_sql_init();
printf("char server initializing done.....\n");