Merge login state machines for both clients

Also do some cleanup and refactoring of related code.

1 files changed, 9 insertions, 4 deletions

diff --git a/src/net/net.h b/src/net/net.h
index 1d91faa7..5b0c92f4 100644
--- a/src/net/net.h
+++ b/src/net/net.h
@@ -19,6 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "net/serverinfo.h"
+
 #ifndef NET_H
 #define NET_H
 
@@ -27,12 +29,11 @@ namespace Net {
 class AdminHandler;
 class CharHandler;
 class ChatHandler;
+class GameHandler;
 class GeneralHandler;
 class GuildHandler;
 class InventoryHandler;
 class LoginHandler;
-class LogoutHandler;
-class MapHandler;
 class NpcHandler;
 class PartyHandler;
 class PlayerHandler;
@@ -42,18 +43,22 @@ class TradeHandler;
 AdminHandler *getAdminHandler();
 CharHandler *getCharHandler();
 ChatHandler *getChatHandler();
+GameHandler *getGameHandler();
 GeneralHandler *getGeneralHandler();
 GuildHandler *getGuildHandler();
 InventoryHandler *getInventoryHandler();
 LoginHandler *getLoginHandler();
-LogoutHandler *getLogoutHandler();
-MapHandler *getMapHandler();
 NpcHandler *getNpcHandler();
 PartyHandler *getPartyHandler();
 PlayerHandler *getPlayerHandler();
 SpecialHandler *getSpecialHandler();
 TradeHandler *getTradeHandler();
 
+/**
+ * Handles server detection and connection
+ */
+void connectToServer(const ServerInfo &server);
+
 } // namespace Net
 
 #endif // NET_H