Extract shared logic from chathandler and gamehandler netcode to ea namespace.

1 files changed, 3 insertions, 21 deletions

diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index 4abfd43c0..6824ee672 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -23,15 +23,13 @@
 #ifndef NET_TA_MAPHANDLER_H
 #define NET_TA_MAPHANDLER_H
 
-#include "listener.h"
-
 #include "net/gamehandler.h"
 #include "net/net.h"
 #include "net/serverinfo.h"
 
 #include "net/tmwa/messagehandler.h"
 
-#include "net/ea/token.h"
+#include "net/ea/gamehandler.h"
 
 #ifdef __GNUC__
 #define A_UNUSED  __attribute__ ((unused))
@@ -42,44 +40,28 @@
 namespace TmwAthena
 {
 
-class GameHandler : public MessageHandler, public Net::GameHandler,
-        public Mana::Listener
+class GameHandler : public MessageHandler, public Ea::GameHandler
 {
     public:
         GameHandler();
 
         void handleMessage(Net::MessageIn &msg);
 
-        void event(Mana::Channels channel, const Mana::Event &event);
-
         void connect();
 
         bool isConnected();
 
         void disconnect();
 
-        void who();
-
         void quit();
 
         void ping(int tick);
 
-        bool removeDeadBeings() const
-        { return true; }
-
         void clear();
 
-        void setMap(const std::string map);
-
-        /** The tmwAthena protocol is making use of the MP status bar. */
-        bool canUseMagicBar() const
-        { return true; }
-
         void disconnect2();
 
-    private:
-        std::string mMap;
-        int mCharID; /// < Saved for map-server switching
+        void mapLoadedEvent();
 };
 
 } // namespace TmwAthena