Merge eA's command handling into CommandHandler

Also drop Aethyra's custom magic code

1 files changed, 32 insertions, 1 deletions

diff --git a/src/commandhandler.h b/src/commandhandler.h
index eab0f077..e8da51d7 100644
--- a/src/commandhandler.h
+++ b/src/commandhandler.h
@@ -24,6 +24,10 @@
 
 #include <string>
 
+#ifdef EATHENA_SUPPORT
+class Network;
+#endif
+
 /**
  * A class to parse and handle user commands
  */
@@ -33,7 +37,11 @@ class CommandHandler
         /**
          * Constructor
          */
-        CommandHandler() {}
+#ifdef TMWSERV_SUPPORT
+        CommandHandler();
+#else
+        CommandHandler(Network *network);
+#endif
 
         /**
          * Destructor
@@ -116,6 +124,29 @@ class CommandHandler
          */
         void handleKick(const std::string &args);
 
+        /**
+         * Handle a me command.
+         */
+        void handleMe(const std::string &args);
+
+        /**
+         * Handle a record command.
+         */
+        void handleRecord(const std::string &args);
+
+        /**
+         * Handle a toggle command.
+         */
+        void handleToggle(const std::string &args);
+
+        /**
+         * Handle a present command.
+         */
+        void handlePresent(const std::string &args);
+
+#ifdef EATHENA_SUPPORT
+        Network *mNetwork;
+#endif
 };
 
 extern CommandHandler *commandHandler;