Merge login state machines for both clients

Also do some cleanup and refactoring of related code.

1 files changed, 7 insertions, 3 deletions

diff --git a/src/net/ea/network.h b/src/net/ea/network.h
index 741a8297..b61f363b 100644
--- a/src/net/ea/network.h
+++ b/src/net/ea/network.h
@@ -22,6 +22,8 @@
 #ifndef EA_NETWORK_H
 #define EA_NETWORK_H
 
+#include "net/serverinfo.h"
+
 #include <SDL_net.h>
 #include <SDL_thread.h>
 
@@ -47,10 +49,13 @@ class Network
 
         ~Network();
 
-        bool connect(const std::string &address, short port);
+        bool connect(ServerInfo server);
 
         void disconnect();
 
+        ServerInfo getServer()
+        { return mServer; }
+
         void registerHandler(MessageHandler *handler);
 
         void unregisterHandler(MessageHandler *handler);
@@ -97,8 +102,7 @@ class Network
 
         TCPsocket mSocket;
 
-        std::string mAddress;
-        short mPort;
+        ServerInfo mServer;
 
         char *mInBuffer, *mOutBuffer;
         unsigned int mInSize, mOutSize;