From eee4c9a1e2a9fc58ccb8ad05acfe0b0e41ec3fab Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 23 Mar 2009 11:14:00 -0600 Subject: 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. --- src/game.cpp | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'src/game.cpp') 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" -- cgit v1.2.3-70-g09d2