Remove more _SUPPORT ifdefs and do some cleanup

1 files changed, 10 insertions, 7 deletions

diff --git a/src/net/manaserv/gameserver/gameserver.cpp b/src/net/manaserv/gameserver/gameserver.cpp
index 94015c20..ba3bd983 100644
--- a/src/net/manaserv/gameserver/gameserver.cpp
+++ b/src/net/manaserv/gameserver/gameserver.cpp
@@ -24,27 +24,30 @@
 #include "internal.h"
 
 #include "net/manaserv/connection.h"
+#include "net/manaserv/messageout.h"
 #include "net/manaserv/protocol.h"
 
-#include "net/messageout.h"
+namespace ManaServ
+{
 
-void Net::GameServer::connect(Net::Connection *connection,
-        const std::string &token)
+void GameServer::connect(Connection *connection, const std::string &token)
 {
-    Net::GameServer::connection = connection;
+    GameServer::connection = connection;
 
     MessageOut msg(PGMSG_CONNECT);
 
     msg.writeString(token, 32);
 
-    Net::GameServer::connection->send(msg);
+    GameServer::connection->send(msg);
 }
 
-void Net::GameServer::logout(bool reconnectAccount)
+void GameServer::logout(bool reconnectAccount)
 {
     MessageOut msg(PGMSG_DISCONNECT);
 
     msg.writeInt8((unsigned char) reconnectAccount);
 
-    Net::GameServer::connection->send(msg);
+    GameServer::connection->send(msg);
+}
+
 }