git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@637 54d463be-8e91-2dee-dedb-b68131a5f0ec

12 files changed, 22 insertions, 7 deletions

diff --git a/Changelog.txt b/Changelog.txt
index 8ab0a58a3..e499f9d9f 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,6 +1,9 @@
 Date	Added
 
 12/19
+	* Modified all the *_athena.conf's to have the import command enabled by default [Ajarn]
+	* Added charcommand_conf.txt and log_conf.txt in conf-tmpl/import [Ajarn]
+	* Fixed import command for log_athena.conf file [Ajarn]
 	* Updated charcommand.conf [nsstrunks]
 
 12/18
diff --git a/conf-tmpl/atcommand_athena.conf b/conf-tmpl/atcommand_athena.conf
index 505215c69..10e5440c0 100644
--- a/conf-tmpl/atcommand_athena.conf
+++ b/conf-tmpl/atcommand_athena.conf
@@ -671,4 +671,4 @@ gm: 100
 //---------------------
 // OTHER: not a command
 
-//import: conf/import/atcommand_conf.txt
+import: conf/import/atcommand_conf.txt
diff --git a/conf-tmpl/char_athena.conf b/conf-tmpl/char_athena.conf
index 4783f0446..93769c144 100644
--- a/conf-tmpl/char_athena.conf
+++ b/conf-tmpl/char_athena.conf
@@ -168,4 +168,6 @@ anti_freeze_interval: 6
 imalive_on: 0
 imalive_time: 30
 flush_on: 0
-flush_time: 30 
\ No newline at end of file
+flush_time: 30 
+
+import: conf/import/char_conf.txt
\ No newline at end of file
diff --git a/conf-tmpl/charcommand_athena.conf b/conf-tmpl/charcommand_athena.conf
index 82a967053..b2549f02b 100644
--- a/conf-tmpl/charcommand_athena.conf
+++ b/conf-tmpl/charcommand_athena.conf
@@ -22,3 +22,5 @@ spiritball: 60
 item: 60
 job: 60
 jobchange: 60
+
+import: conf/import/charcommand_conf.txt
diff --git a/conf-tmpl/import/charcommand_conf.txt b/conf-tmpl/import/charcommand_conf.txt
new file mode 100755
index 000000000..e69de29bb
--- /dev/null
+++ b/conf-tmpl/import/charcommand_conf.txt
diff --git a/conf-tmpl/import/log_conf.txt b/conf-tmpl/import/log_conf.txt
new file mode 100755
index 000000000..e69de29bb
--- /dev/null
+++ b/conf-tmpl/import/log_conf.txt
diff --git a/conf-tmpl/inter_athena.conf b/conf-tmpl/inter_athena.conf
index 475969f2b..f3fc90d50 100644
--- a/conf-tmpl/inter_athena.conf
+++ b/conf-tmpl/inter_athena.conf
@@ -126,3 +126,5 @@ use_sql_db: no
 
 // Log Inter Connections, etc.?
 log_inter: 1
+
+import: conf/import/inter_conf.txt
\ No newline at end of file
diff --git a/conf-tmpl/ladmin_athena.conf b/conf-tmpl/ladmin_athena.conf
index e6f589863..dafd72388 100644
--- a/conf-tmpl/ladmin_athena.conf
+++ b/conf-tmpl/ladmin_athena.conf
@@ -30,5 +30,4 @@ ladmin_log_filename: log/ladmin.log
 // 3: 2004-12-31 23:59:59 (default)
 date_format: 3
 
-// If you want use an additional configuration file, uncomment and use this parameter
-//import: path/additional_configuration_file
+import: conf/import/ladmin_conf.txt
diff --git a/conf-tmpl/log_athena.conf b/conf-tmpl/log_athena.conf
index 1f7cd5e0e..4a90ca628 100644
--- a/conf-tmpl/log_athena.conf
+++ b/conf-tmpl/log_athena.conf
@@ -91,4 +91,6 @@ log_trade: log/tradelog.log
 log_vend: log/vendlog.log
 
 // GM Log File
-log_gm: log/atcommandlog.log
\ No newline at end of file
+log_gm: log/atcommandlog.log
+
+import: conf/import/log_conf.txt
\ No newline at end of file
diff --git a/conf-tmpl/login_athena.conf b/conf-tmpl/login_athena.conf
index d58ed3bf9..cdb612b6c 100644
--- a/conf-tmpl/login_athena.conf
+++ b/conf-tmpl/login_athena.conf
@@ -153,3 +153,5 @@ imalive_time: 60
 flush_on: 0
 // How often to flush the buffer in Mugendai's GUI
 flush_time: 60
+
+import: conf/import/login_conf.txt
\ No newline at end of file
diff --git a/conf-tmpl/map_athena.conf b/conf-tmpl/map_athena.conf
index 8cacdc279..f9518ff8f 100644
--- a/conf-tmpl/map_athena.conf
+++ b/conf-tmpl/map_athena.conf
@@ -1192,10 +1192,10 @@ map: que_god02.gat
 //map: tank_test2.gat
 //map: test.gat
 
-import: conf/import/map_conf.txt
-
 // Mugendai's GUI Support
 imalive_on: 0
 imalive_time: 30
 flush_on: 0
 flush_time: 30 
+
+import: conf/import/map_conf.txt
diff --git a/src/map/log.c b/src/map/log.c
index e6274b6f7..be8280b7f 100644
--- a/src/map/log.c
+++ b/src/map/log.c
@@ -471,6 +471,9 @@ int log_config_read(char *cfgName)
 				strcpy(log_config.log_gm, w2);
 				if(log_config.gm > 0)
 					printf("Logging GM Level %d Commands to file `%s`.txt\n", log_config.gm, w2);
+			//support the import command, just like any other config
+			} else if(strcmpi(w1,"import")==0){
+				log_config_read(w2);
 			}
 		}
 	}