Merge login state machines for both clients

Also do some cleanup and refactoring of related code.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/net/ea/generalhandler.h b/src/net/ea/generalhandler.h
index 98364e5d..099bed0b 100644
--- a/src/net/ea/generalhandler.h
+++ b/src/net/ea/generalhandler.h
@@ -25,6 +25,7 @@
 #include "net/generalhandler.h"
 #include "net/messagehandler.h"
 #include "net/net.h"
+#include "net/serverinfo.h"
 
 namespace EAthena {
 
@@ -51,6 +52,8 @@ class GeneralHandler : public MessageHandler, public Net::GeneralHandler
 
         void guiWindowsUnloaded();
 
+        void clearHandlers();
+
     protected:
         MessageHandlerPtr mAdminHandler;
         MessageHandlerPtr mBeingHandler;
@@ -58,11 +61,10 @@ class GeneralHandler : public MessageHandler, public Net::GeneralHandler
         MessageHandlerPtr mCharHandler;
         MessageHandlerPtr mChatHandler;
         MessageHandlerPtr mEquipmentHandler;
+        MessageHandlerPtr mGameHandler;
         MessageHandlerPtr mInventoryHandler;
         MessageHandlerPtr mItemHandler;
         MessageHandlerPtr mLoginHandler;
-        MessageHandlerPtr mLogoutHandler;
-        MessageHandlerPtr mMapHandler;
         MessageHandlerPtr mNpcHandler;
         MessageHandlerPtr mPartyHandler;
         MessageHandlerPtr mPlayerHandler;