Make GeneralHandlers for both networks

Also make Net::LogoutHandler

1 files changed, 2 insertions, 34 deletions

diff --git a/src/game.h b/src/game.h
index 60de5cd9..ddda7cfc 100644
--- a/src/game.h
+++ b/src/game.h
@@ -22,17 +22,12 @@
 #ifndef GAME_H
 #define GAME_H
 
-#include <memory>
+//#include <memory>
 
 #include "SDL.h"
 
 #include "configlistener.h"
 
-class MessageHandler;
-#ifdef EATHENA_SUPPORT
-class Network;
-#endif
-
 extern std::string map_path;
 extern volatile int fps;
 extern volatile int tick_time;
@@ -40,11 +35,8 @@ extern volatile int tick_time;
 class Game : public ConfigListener
 {
     public:
-#ifdef TMWSERV_SUPPORT
         Game();
-#else
-        Game(Network *network);
-#endif
+
         ~Game();
 
         void logic();
@@ -54,36 +46,12 @@ class Game : public ConfigListener
         void optionChanged(const std::string &name);
 
     private:
-#ifdef EATHENA_SUPPORT
-        Network *mNetwork;
-#endif
-
         /** Used to determine whether to draw the next frame. */
         int mDrawTime;
 
         /** The minimum frame time (used for frame limiting). */
         int mMinFrameTime;
 
-        typedef const std::auto_ptr<MessageHandler> MessageHandlerPtr;
-        MessageHandlerPtr mBeingHandler;
-#ifdef TMWSERV_SUPPORT
-        MessageHandlerPtr mGuildHandler;
-        MessageHandlerPtr mEffectHandler;
-#else
-        MessageHandlerPtr mAdminHandler;
-        MessageHandlerPtr mEquipmentHandler;
-        MessageHandlerPtr mSkillHandler;
-#endif
-        MessageHandlerPtr mPartyHandler;
-        MessageHandlerPtr mBuySellHandler;
-        MessageHandlerPtr mChatHandler;
-        MessageHandlerPtr mInventoryHandler;
-        MessageHandlerPtr mItemHandler;
-        MessageHandlerPtr mNpcHandler;
-        MessageHandlerPtr mPlayerHandler;
-        MessageHandlerPtr mPostHandler;
-        MessageHandlerPtr mTradeHandler;
-
         int mLastTarget;
 
         SDL_TimerID mLogicCounterId;