get rid of /admin commands

2 files changed, 7 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 8225ff6a..938fd1db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-25  Roderic Morris  <roderic@ccs.neu.edu>
+
+	* src/commandhandler.cpp: get rid of /admin commands (they're now
+	@ commands).
+
 2008-10-25  Chuck Miller  <shadowmil@gmail.com>
 
 	* src/localplayer.h,src/localplayer.cpp,src/game.cpp: Played around
@@ -5,7 +10,7 @@
 	better.
 
 2008-10-24  Chuck Miller  <shadowmil@gmail.com>
-	
+
 	* src/resources/iteminfo.h,src/resources/itemdb.cpp: Added attack
 	range to item's info
 	* src/localplayer.h,src/localplayer.cpp: Changed the getAttackRange
@@ -22,7 +27,7 @@
 	set
 
 2008-10-23  Chuck Miller  <shadowmil@gmail.com>
-	
+
 	* src/beingmanager.cpp: Fixed a bug causing targets not to work, and
 	added code that sets player_node's target to null if it gets deleted
 	* src/gui/viewport.cpp: Changed some values to make targets show
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 66f746f3..2475457a 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -77,10 +77,6 @@ void CommandHandler::handleCommand(const std::string &command)
     {
         handleTopic(args);
     }
-    else if (type == "admin")
-    {
-        Net::GameServer::Player::say("/" + args);
-    }
     else if (type == "clear")
     {
         handleClear();
@@ -143,27 +139,10 @@ void CommandHandler::handleHelp(const std::string &args)
         chatWindow->chatLog("/join > Join or create a channel");
         chatWindow->chatLog("/topic > Set the topic of the current channel");
         chatWindow->chatLog("/quit > Leave a channel");
-        chatWindow->chatLog("/admin > Send a command to the server (GM only)");
         chatWindow->chatLog("/clear > Clears this window");
         chatWindow->chatLog("/party > Invite a user to party");
         chatWindow->chatLog("For more information, type /help <command>");
     }
-    else if (args == "admin")
-    {
-        chatWindow->chatLog("Command: /admin <command>");
-        chatWindow->chatLog("*** only available to a GM ***");
-        chatWindow->chatLog("This command sends an admin command to the server.");
-        chatWindow->chatLog("<command> can be:");
-        chatWindow->chatLog("reload <db>");
-        chatWindow->chatLog("warp <name> <map> <x> <y>");
-        chatWindow->chatLog("item <name> <id> <quantity>");
-        chatWindow->chatLog("drop <id> <quantity>");
-        chatWindow->chatLog("money <name> <quantity>");
-        chatWindow->chatLog("spawn <id> <quantity>");
-        chatWindow->chatLog("goto <name>");
-        chatWindow->chatLog("recall <name>");
-        chatWindow->chatLog("ban <name> <duration>");
-    }
     else if (args == "announce")
     {
         chatWindow->chatLog("Command: /announce <msg>");