Added admin commands to /help and added registration of party handler

4 files changed, 19 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 1da6e966..eee2a19d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-14  David Athay  <ko2fan@gmail.com>
+
+	* src/game.cpp, src/commandhandler.cpp, src/game.h: Added admin commands
+	to /help. Added registering party handler.
+
 2008-07-07  Roderic Morris  <roderic@ccs.neu.edu>
 
 	* src/net/chathandler.cpp, src/net/chathandler.h, src/commandhandler.h,
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 8f0aa907..8e6003f9 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -102,7 +102,6 @@ void CommandHandler::handleAnnounce(const std::string &args)
 
 void CommandHandler::handleHelp(const std::string &args)
 {
-    chatWindow->chatLog("-- Help --", BY_SERVER);
     if (args == "")
     {
         chatWindow->chatLog("-- Help --");
@@ -126,6 +125,16 @@ void CommandHandler::handleHelp(const std::string &args)
         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")
     {
diff --git a/src/game.cpp b/src/game.cpp
index dcc2ba0a..f0209b73 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -81,6 +81,7 @@
 #include "net/itemhandler.h"
 #include "net/network.h"
 #include "net/npchandler.h"
+#include "net/partyhandler.h"
 #include "net/playerhandler.h"
 #include "net/tradehandler.h"
 
@@ -269,6 +270,7 @@ Game::Game():
     mInventoryHandler(new InventoryHandler()),
     mItemHandler(new ItemHandler()),
     mNpcHandler(new NPCHandler()),
+    mPartyHandler(new PartyHandler()),
     mPlayerHandler(new PlayerHandler()),
     mTradeHandler(new TradeHandler()),
     mLogicCounterId(0), mSecondsCounterId(0)
@@ -313,6 +315,7 @@ Game::Game():
     Net::registerHandler(mInventoryHandler.get());
     Net::registerHandler(mItemHandler.get());
     Net::registerHandler(mNpcHandler.get());
+    Net::registerHandler(mPartyHandler.get());
     Net::registerHandler(mPlayerHandler.get());
     Net::registerHandler(mTradeHandler.get());
 }
diff --git a/src/game.h b/src/game.h
index 28feae44..cdfe025b 100644
--- a/src/game.h
+++ b/src/game.h
@@ -67,6 +67,7 @@ class Game : public ConfigListener
         MessageHandlerPtr mInventoryHandler;
         MessageHandlerPtr mItemHandler;
         MessageHandlerPtr mNpcHandler;
+        MessageHandlerPtr mPartyHandler;
         MessageHandlerPtr mPlayerHandler;
         MessageHandlerPtr mTradeHandler;