summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2015-04-29 22:30:45 -0500
committerWushin <pasekei@gmail.com>2015-04-29 22:30:45 -0500
commit47987560e755cf26745bd95ba73e176aa1ab24d7 (patch)
tree8bffd46ef13102587281255649bf1a6ae303764a
parentebf8941801aa30a66357543e591ce7b1a5d38765 (diff)
parent3cc396f75f86ac777d031034c787c3de67a3ff0c (diff)
downloadserverdata-47987560e755cf26745bd95ba73e176aa1ab24d7.tar.gz
serverdata-47987560e755cf26745bd95ba73e176aa1ab24d7.tar.bz2
serverdata-47987560e755cf26745bd95ba73e176aa1ab24d7.tar.xz
serverdata-47987560e755cf26745bd95ba73e176aa1ab24d7.zip
Merge pull request #333 from mekolat/patch-2
remove traces of @gm
-rw-r--r--login/conf/login_local.conf.example10
-rw-r--r--world/map/conf/atcommand_local.conf.example7
2 files changed, 0 insertions, 17 deletions
diff --git a/login/conf/login_local.conf.example b/login/conf/login_local.conf.example
index f0ab0bc4..635f22ee 100644
--- a/login/conf/login_local.conf.example
+++ b/login/conf/login_local.conf.example
@@ -22,16 +22,6 @@ admin_pass: admin
//ladminallowip: clear
ladminallowip: 127.0.0.1
-// Gamemaster password, used with the @gm command to obtain GM commands
-// NOTICE: You should also change this one.
-gm_pass: gm
-
-// GM level granted to people using @gm (with the correct password).
-// Builtin default is 60; setting it to 0 will disable the command.
-// To work, @gm also needs to be level 0 in atcommand_local.conf,
-// and atcommand_gm_only needs to be off in battle_local.conf
-level_new_gm: 0
-
// Update host
// If not empty, send address for client to download data.
// This must contain news.txt and resources.xml
diff --git a/world/map/conf/atcommand_local.conf.example b/world/map/conf/atcommand_local.conf.example
index 3935db1b..916a092c 100644
--- a/world/map/conf/atcommand_local.conf.example
+++ b/world/map/conf/atcommand_local.conf.example
@@ -1,8 +1 @@
// Athena atcommand Local Configuration file.
-
-// Command to become a GM. Only players who are not a GM can use this.
-// In addition to changing this to 0, you must also:
-// - set level_new_gm in login_athena.conf to something other than 0
-// - set atcommand_gm_only to false in battle_athena.conf
-// - give the correct password (gm_pass in login_athena.conf)
-gm: 100