summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-03-23 11:14:00 -0600
committerJared Adams <jaxad0127@gmail.com>2009-03-23 11:14:00 -0600
commiteee4c9a1e2a9fc58ccb8ad05acfe0b0e41ec3fab (patch)
treee6a09e53f092b94614ea66d92af27c684772cd42 /src/main.cpp
parent1850cca2e8ba43b1e70385d848dca9f3a91fef4a (diff)
downloadmana-eee4c9a1e2a9fc58ccb8ad05acfe0b0e41ec3fab.tar.gz
mana-eee4c9a1e2a9fc58ccb8ad05acfe0b0e41ec3fab.tar.bz2
mana-eee4c9a1e2a9fc58ccb8ad05acfe0b0e41ec3fab.tar.xz
mana-eee4c9a1e2a9fc58ccb8ad05acfe0b0e41ec3fab.zip
Move all TMWServ-specific code to net/tmwserv
Also fix several instances where the same net handler was being used for both servers, and a few other related oddities.
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/main.cpp b/src/main.cpp
index b9919a2c..f108b9cf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -73,10 +73,11 @@
#include "gui/updatewindow.h"
#ifdef TMWSERV_SUPPORT
-#include "net/charserverhandler.h"
-#include "net/connection.h"
-#include "net/loginhandler.h"
-#include "net/network.h"
+#include "net/tmwserv/charserverhandler.h"
+#include "net/tmwserv/connection.h"
+#include "net/tmwserv/loginhandler.h"
+#include "net/tmwserv/logouthandler.h"
+#include "net/tmwserv/network.h"
#else
#include "net/ea/charserverhandler.h"
#include "net/ea/loginhandler.h"
@@ -84,15 +85,14 @@
#include "net/ea/maploginhandler.h"
#include "net/messageout.h"
#endif
-#include "net/logouthandler.h"
#ifdef TMWSERV_SUPPORT
-#include "net/accountserver/accountserver.h"
-#include "net/accountserver/account.h"
+#include "net/tmwserv/accountserver/accountserver.h"
+#include "net/tmwserv/accountserver/account.h"
-#include "net/chatserver/chatserver.h"
+#include "net/tmwserv/chatserver/chatserver.h"
-#include "net/gameserver/gameserver.h"
+#include "net/tmwserv/gameserver/gameserver.h"
#endif
#include "resources/colordb.h"