summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/Changelog.txt1
-rw-r--r--conf/atcommand_athena.conf24
-rw-r--r--conf/inter_athena.conf3
3 files changed, 4 insertions, 24 deletions
diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 776e569dc..457952988 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -3,6 +3,7 @@ Date Added
2007/10/22
* Rev. 11551 Fixed nopenalty entries for Turbo Track maps. [L0ne_W0lf]
* Rev. 11546 Added Turbo Track map flags. [L0ne_W0lf]
+ * Removed the mail_server_enable setting as it's not required. [Zephyrus]
2007/10/13
* Renamed the config default_skill_delay to default_walk_delay as that is
the only thing it does now.
diff --git a/conf/atcommand_athena.conf b/conf/atcommand_athena.conf
index 183278246..06fec590e 100644
--- a/conf/atcommand_athena.conf
+++ b/conf/atcommand_athena.conf
@@ -157,28 +157,10 @@ version: 1
whodrops: 1
//---------------------------------------------------------------
-// 0: Mail System - SQL Only commands - Must be enabled
+// 0: Mail System - SQL Only commands
-// Check # of messages.
-checkmail: 1
-
-// List all messages.
-listmail: 1
-
-// List only new mail.
-listnewmail: 1
-
-// Read a message.
-readmail: 1
-
-// Send mail.
-sendmail: 1
-
-// Send priority mail (tagged with Priority and cannot be deleted until read)
-sendprioritymail: 80
-
-// Delete a message.
-deletemail: 1
+// Opens mail Window.
+mail: 1
//---------------------------
// 10: Super player+ commands
diff --git a/conf/inter_athena.conf b/conf/inter_athena.conf
index 29bdb7aa2..904a56433 100644
--- a/conf/inter_athena.conf
+++ b/conf/inter_athena.conf
@@ -151,9 +151,6 @@ mail_db: mail
//Use SQL item_db and mob_db for the map server
use_sql_db: no
-// Use SQL Mail Server
-mail_server_enable: no
-
// Nick for sending mainchat
// messages like whisper
main_chat_nick: Main