summaryrefslogtreecommitdiff
path: root/src/game.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/game.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/game.cpp')
-rw-r--r--src/game.cpp29
1 files changed, 17 insertions, 12 deletions
diff --git a/src/game.cpp b/src/game.cpp
index aefefd29..79eaf9c5 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -85,25 +85,30 @@
#include "gui/quitdialog.h"
#endif
-#include "net/chathandler.h"
-#include "net/itemhandler.h"
-#include "net/npchandler.h"
-#include "net/playerhandler.h"
-#include "net/tradehandler.h"
#ifdef TMWSERV_SUPPORT
-#include "net/network.h"
-#include "net/beinghandler.h"
-#include "net/buysellhandler.h"
-#include "net/effecthandler.h"
-#include "net/guildhandler.h"
-#include "net/inventoryhandler.h"
-#include "net/partyhandler.h"
+#include "net/tmwserv/chathandler.h"
+#include "net/tmwserv/itemhandler.h"
+#include "net/tmwserv/npchandler.h"
+#include "net/tmwserv/playerhandler.h"
+#include "net/tmwserv/tradehandler.h"
+#include "net/tmwserv/network.h"
+#include "net/tmwserv/beinghandler.h"
+#include "net/tmwserv/buysellhandler.h"
+#include "net/tmwserv/effecthandler.h"
+#include "net/tmwserv/guildhandler.h"
+#include "net/tmwserv/inventoryhandler.h"
+#include "net/tmwserv/partyhandler.h"
#else
#include "net/ea/network.h"
+#include "net/ea/chathandler.h"
#include "net/ea/beinghandler.h"
#include "net/ea/buysellhandler.h"
#include "net/ea/equipmenthandler.h"
#include "net/ea/inventoryhandler.h"
+#include "net/ea/itemhandler.h"
+#include "net/ea/npchandler.h"
+#include "net/ea/playerhandler.h"
+#include "net/ea/tradehandler.h"
#include "net/ea/protocol.h"
#include "net/ea/skillhandler.h"
#include "net/messageout.h"