summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2008-11-13 18:15:23 +0000
committerJared Adams <jaxad0127@gmail.com>2008-11-13 18:15:23 +0000
commit6f11fba50c92d937689646dc9ef4bfbf63da0fa3 (patch)
treeae325ae391803215f46d8aa934eb4e84e71dee24 /conf
parentf9d96008eca02f9b60076221cba77b83a3631f33 (diff)
downloadserverdata-6f11fba50c92d937689646dc9ef4bfbf63da0fa3.tar.gz
serverdata-6f11fba50c92d937689646dc9ef4bfbf63da0fa3.tar.bz2
serverdata-6f11fba50c92d937689646dc9ef4bfbf63da0fa3.tar.xz
serverdata-6f11fba50c92d937689646dc9ef4bfbf63da0fa3.zip
Move local imports to the end of the main files
This makes it easier to overwrite existing values. It also removes an unused import.
Diffstat (limited to 'conf')
-rw-r--r--conf/battle_athena.conf4
-rw-r--r--conf/char_athena.conf6
-rw-r--r--conf/ladmin_athena.conf6
-rw-r--r--conf/login_athena.conf6
-rw-r--r--conf/map_athena.conf6
5 files changed, 11 insertions, 17 deletions
diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf
index 1324bd34..3419fc80 100644
--- a/conf/battle_athena.conf
+++ b/conf/battle_athena.conf
@@ -723,7 +723,3 @@ spam_threshold: 10
// Maximum line lengt, if a message is above chat_maxline, its dropped [1-512]. Default 255.
chat_maxline: 512
-
-
-import: conf/import/battle_conf.txt
-
diff --git a/conf/char_athena.conf b/conf/char_athena.conf
index 6b9e8a5f..c7b14429 100644
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -1,9 +1,5 @@
// Athena Character configuration file.
-// local settings for this server in this file
-import: conf/char_local.conf
-
-
// Option to force a player to create an e-mail.
// If a player have default e-mail, and if you activate this option, the player can only connect in the game (to arrive on a map) like follow:
// - Create at least 1 character
@@ -123,3 +119,5 @@ anti_freeze_interval: 6
// If you want use an additional configuration file, uncomment and use this parameter
//import: path/additional_configuration_file
+// local settings for this server in this file
+import: conf/char_local.conf
diff --git a/conf/ladmin_athena.conf b/conf/ladmin_athena.conf
index d4adf44e..2a91a35b 100644
--- a/conf/ladmin_athena.conf
+++ b/conf/ladmin_athena.conf
@@ -1,7 +1,4 @@
// Athena Ladmin configuration file.
-
-// local settings for this server in this file
-import: conf/ladmin_local.conf
// Encoding type of the password
// 0: not encoded
@@ -26,3 +23,6 @@ date_format: 3
// If you want use an additional configuration file, uncomment and use this parameter
//import: path/additional_configuration_file
+
+// local settings for this server in this file
+import: conf/ladmin_local.conf
diff --git a/conf/login_athena.conf b/conf/login_athena.conf
index afd47493..8c724b69 100644
--- a/conf/login_athena.conf
+++ b/conf/login_athena.conf
@@ -1,8 +1,5 @@
// Athena Login Server configuration file.
// Translated by Peter Kieser <pfak@telus.net>
-
-// local settings for this server in this file
-import: conf/login_local.conf
// Level of new GM created with @gm command. (default: 60)
// If you set to 0, you disable creation of new GM with @gm.
@@ -115,3 +112,6 @@ dynamic_account_ban_class: 0
anti_freeze_enable: 0
// Anti-freeze system interval (in seconds)
anti_freeze_interval: 15
+
+// local settings for this server in this file
+import: conf/login_local.conf
diff --git a/conf/map_athena.conf b/conf/map_athena.conf
index 6ea1184e..25ea0676 100644
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -1,8 +1,5 @@
// eAthena Map-Server Configuration File
-// local settings for this server in this file
-import: conf/map_local.conf
-
// Maps
map: new_39-1.gat
map: new_38-1.gat
@@ -321,3 +318,6 @@ npc: npc/new_38-1-woodland-mine/receptionist.txt
// Halloween 2008
// npc: npc/halloween/2008/monsters.txt
// npc: npc/halloween/2008/prize_master.txt
+
+// local settings for this server in this file
+import: conf/map_local.conf