From c60d3a98dbbb20621742bfd82bbaaa6b7085a8ae Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Mon, 2 Nov 2009 16:29:17 -0700
Subject: Remove more support #ifdefs

---
 src/main.cpp | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 7aa795ac..ce1c9c9b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -68,22 +68,6 @@
 #include "net/loginhandler.h"
 #include "net/net.h"
 #include "net/worldinfo.h"
-#ifdef MANASERV_SUPPORT
-#include "net/manaserv/charhandler.h"
-#include "net/manaserv/connection.h"
-#include "net/manaserv/generalhandler.h"
-#include "net/manaserv/loginhandler.h"
-#include "net/manaserv/network.h"
-#endif
-
-#ifdef MANASERV_SUPPORT
-#include "net/manaserv/accountserver/accountserver.h"
-#include "net/manaserv/accountserver/account.h"
-
-#include "net/manaserv/chatserver/chatserver.h"
-
-#include "net/manaserv/gameserver/gameserver.h"
-#endif
 
 #include "resources/colordb.h"
 #include "resources/emotedb.h"
@@ -139,11 +123,11 @@ namespace
 static const int defaultSfxVolume = 100;
 static const int defaultMusicVolume = 60;
 
-#ifdef MANASERV_SUPPORT
+/*#ifdef MANASERV_SUPPORT
 extern Net::Connection *gameServerConnection;
 extern Net::Connection *chatServerConnection;
 extern Net::Connection *accountServerConnection;
-#endif
+#endif*/
 
 Graphics *graphics;
 Game *game = 0;
@@ -1235,9 +1219,8 @@ int main(int argc, char *argv[])
 
                 case STATE_UNREGISTER_SUCCESS:
                     logger->log("State: UNREGISTER SUCCESS");
-#ifdef MANASERV_SUPPORT
-                    accountServerConnection->disconnect();
-#endif
+                    Net::getLoginHandler()->disconnect();
+
                     currentDialog = new OkDialog(_("Unregister Successful"),
                             _("Farewell, come back any time..."));
                     loginData.clear();
@@ -1249,11 +1232,8 @@ int main(int argc, char *argv[])
                 case STATE_SWITCH_SERVER:
                     logger->log("State: SWITCH SERVER");
 
-#ifdef MANASERV_SUPPORT
-                    gameServerConnection->disconnect();
-                    chatServerConnection->disconnect();
-                    accountServerConnection->disconnect();
-#endif
+                    Net::getLoginHandler()->disconnect();
+                    Net::getGameHandler()->disconnect();
 
                     state = STATE_CHOOSE_SERVER;
                     break;
-- 
cgit v1.2.3-60-g2f50