summaryrefslogtreecommitdiff
path: root/src/account-server/serverhandler.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/account-server/serverhandler.hpp')
-rw-r--r--src/account-server/serverhandler.hpp31
1 files changed, 13 insertions, 18 deletions
diff --git a/src/account-server/serverhandler.hpp b/src/account-server/serverhandler.hpp
index ec537dbd..febc663e 100644
--- a/src/account-server/serverhandler.hpp
+++ b/src/account-server/serverhandler.hpp
@@ -24,12 +24,13 @@
#ifndef _TMWSERV_SERVERHANDLER_H_
#define _TMWSERV_SERVERHANDLER_H_
-#include <map>
-#include "account-server/accounthandler.hpp"
-#include "account-server/character.hpp"
+#include <string>
+
#include "net/connectionhandler.hpp"
class AccountClient;
+class Character;
+struct GameServer;
/**
* Manages communications with all the game servers. This class also keeps
@@ -47,7 +48,7 @@ class ServerHandler: public ConnectionHandler
* Returns the information a client needs to connect to the game server
* corresponding to the given map ID.
*/
- bool getGameServerFromMap(unsigned, std::string &address, short &port);
+ bool getGameServerFromMap(int, std::string &address, int &port) const;
/**
* Sends a magic token and character data to the relevant game server.
@@ -87,24 +88,18 @@ class ServerHandler: public ConnectionHandler
private:
/**
- * Send invite to user
+ * Returns the information a client needs to connect to the game server
+ * corresponding to the given map ID.
*/
- void sendInvite(const std::string &invitedName, const std::string &inviterName,
- const std::string &guildName);
-
- struct Server
- {
- std::string address;
- short port;
- NetComputer *server;
- };
-
- typedef std::map< unsigned, Server > Servers;
+ GameServer *getGameServerFromMap(int) const;
+#if 0
/**
- * Maps map IDs to game server data.
+ * Send invite to user
*/
- Servers servers;
+ void sendInvite(const std::string &invitedName, const std::string &inviterName,
+ const std::string &guildName);
+#endif
};
extern ServerHandler *serverHandler;