summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/Changelog.txt14
-rw-r--r--conf/char_athena.conf12
-rw-r--r--conf/login_athena.conf6
3 files changed, 13 insertions, 19 deletions
diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 20fa41456..a4fd395f5 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,13 +1,17 @@
Date Added
-2009/3/31
+
+2009/04/01
+ * Removed online_check config options. [FlavioJS]
+ * Clarified char_maintenance config option.
+2009/03/31
* Added missing pet_equip_min_friendly config option [ultramage]
-2009/3/23
+2009/03/23
* Added setting display_status_timers to client.conf for new status change packet. [Sara]
-2009/1/26
+2009/01/26
* Rev. 13494 Changed guild_skill_relog_delay to yes. Relogging no longer resets delay on guild skills. [L0ne_W0lf]
-2009/1/12
+2009/01/12
* Second agitend corrected to agitend2 [SketchyPhoenix]
-2009/1/5
+2009/01/05
* Added @charcommands to return a list of available # commands [SketchyPhoenix]
2008/12/26
* Rev. 13444 Marked new Morroc fields as nomemo. [L0ne_W0lf]
diff --git a/conf/char_athena.conf b/conf/char_athena.conf
index ac9800d68..2773fa08e 100644
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -77,7 +77,10 @@ console: off
// So, default is 0, because administrator must explain to their players before to activate this option.
email_creation: 0
-// Is Character server in maintainence mode?
+// Type of server.
+// No functional side effects at the moment.
+// Displayed next to the server name in the client.
+// 0=normal, 1=maintenance, 2=over 18, 3=paying, 4=P2P
char_maintenance: 0
// Enable or disable creation of new characters.
@@ -90,13 +93,6 @@ char_new_display: 0
// Maximum users able to connect to the server. Set to 0 for unlimited.
max_connect_user: 0
-// When set to yes, the char server will refuse connections from players already online.
-// When a login attempt is rejected, the account in question will be booted from all the connected map servers.
-// Note that this only works within the char-server and it's connected mapservers,
-// the charserver cannot know if the same account is logged on in other char servers.
-// it's safe to turn off if the char-server only has a single map-server connected to it.
-online_check: yes
-
// Minimum GM level that is allowed to bypass the server limit of users.
gm_allow_level: 99
diff --git a/conf/login_athena.conf b/conf/login_athena.conf
index 843486ec0..164c7d316 100644
--- a/conf/login_athena.conf
+++ b/conf/login_athena.conf
@@ -65,12 +65,6 @@ login_log_filename: log/login.log
// NOTE: The login-sql server needs the login logs to enable dynamic pass failure bans.
log_login: yes
-//When set to yes, the login server will refuse connections from accounts that are considered online already.
-//When a login attempt is rejected, the account in question is also kicked from all connected char-servers.
-//It's safe to turn this off if there's only one char-server connected, or if the char-servers don't share
-//the same backend (ie: Multiple char servers reading from the same SQL tables)
-online_check: yes
-
// Indicate how to display date in logs, to players, etc.
date_format: %Y-%m-%d %H:%M:%S