summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author(no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-02-05 05:48:54 +0000
committer(no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-02-05 05:48:54 +0000
commit700daa3c3f2349aab0118d02fb2da6e2932c7ec2 (patch)
tree31d3c94e08b4d5c72f58bd82722084b00190bb89
parentf204cc7915dac6116bce5f402c8882ea0aff49a4 (diff)
downloadhercules-700daa3c3f2349aab0118d02fb2da6e2932c7ec2.tar.gz
hercules-700daa3c3f2349aab0118d02fb2da6e2932c7ec2.tar.bz2
hercules-700daa3c3f2349aab0118d02fb2da6e2932c7ec2.tar.xz
hercules-700daa3c3f2349aab0118d02fb2da6e2932c7ec2.zip
txt convertors reading inter_athena.conf import command
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1038 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt2
-rw-r--r--src/txt-converter/char/char-converter.c3
-rw-r--r--src/txt-converter/login/login-converter.c4
3 files changed, 9 insertions, 0 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 4cb2220f1..95319d2bd 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,6 +1,8 @@
Date Added
02/04
+ * TXT convertors now read the import command in inter_athena.conf
+ [SVN 1038: Ajarn]
* Fixed some compile errors [SVN 1037: MouseJstr]
* Added common/buffer.(c/h) [SVN 1033: Ajarn]
* Login server can now set it's ip address in the config [SVN 1033: Ajarn]
diff --git a/src/txt-converter/char/char-converter.c b/src/txt-converter/char/char-converter.c
index 1c5028d7e..8ffefc83d 100644
--- a/src/txt-converter/char/char-converter.c
+++ b/src/txt-converter/char/char-converter.c
@@ -789,6 +789,9 @@ int inter_config_read(const char *cfgName) {
else if(strcmpi(w1,"db_server_logindb")==0){
strcpy(db_server_logindb, w2);
printf ("set db_server_logindb : %s\n",w2);
+ //support the import command, just like any other config
+ }else if(strcmpi(w1,"import")==0){
+ sql_config_read(w2);
}
}
fclose(fp);
diff --git a/src/txt-converter/login/login-converter.c b/src/txt-converter/login/login-converter.c
index f452d70aa..d301e8db3 100644
--- a/src/txt-converter/login/login-converter.c
+++ b/src/txt-converter/login/login-converter.c
@@ -234,6 +234,10 @@ int login_config_read(const char *cfgName){
strcpy(db_server_logindb, w2);
printf ("set db_server_logindb : %s\n",w2);
}
+ //support the import command, just like any other config
+ else if(strcmpi(w1,"import")==0){
+ login_config_read(w2);
+ }
}
fclose(fp);
printf ("End reading interserver configuration...\n");