summaryrefslogtreecommitdiff
path: root/src/net/manaserv/gamehandler.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-11-03 10:18:25 -0700
committerJared Adams <jaxad0127@gmail.com>2009-11-03 10:18:25 -0700
commitacd557f9472c711fe92b9c158ec336abf688bf7b (patch)
tree2295d13589411ee88afe16f4997bea65b4ebba94 /src/net/manaserv/gamehandler.cpp
parentc60d3a98dbbb20621742bfd82bbaaa6b7085a8ae (diff)
downloadmana-acd557f9472c711fe92b9c158ec336abf688bf7b.tar.gz
mana-acd557f9472c711fe92b9c158ec336abf688bf7b.tar.bz2
mana-acd557f9472c711fe92b9c158ec336abf688bf7b.tar.xz
mana-acd557f9472c711fe92b9c158ec336abf688bf7b.zip
Remove more _SUPPORT ifdefs and do some cleanup
Diffstat (limited to 'src/net/manaserv/gamehandler.cpp')
-rw-r--r--src/net/manaserv/gamehandler.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/net/manaserv/gamehandler.cpp b/src/net/manaserv/gamehandler.cpp
index c7f8eeee..1916d492 100644
--- a/src/net/manaserv/gamehandler.cpp
+++ b/src/net/manaserv/gamehandler.cpp
@@ -34,10 +34,9 @@ Net::GameHandler *gameHandler;
extern ManaServ::ChatHandler *chatHandler;
-extern Net::Connection *gameServerConnection;
-
namespace ManaServ {
+extern Connection *gameServerConnection;
extern std::string netToken;
extern ServerInfo gameServer;
@@ -51,7 +50,7 @@ GameHandler::GameHandler()
gameHandler = this;
}
-void GameHandler::handleMessage(MessageIn &msg)
+void GameHandler::handleMessage(Net::MessageIn &msg)
{
switch (msg.getId())
{
@@ -100,7 +99,7 @@ void GameHandler::disconnect()
void GameHandler::inGame()
{
- Net::GameServer::connect(gameServerConnection, netToken);
+ GameServer::connect(gameServerConnection, netToken);
chatHandler->connect();
}