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.

9 files changed, 13 insertions, 11 deletions

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 15a558a3..53a586c3 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -34,7 +34,7 @@
 #include "../units.h"
 
 #ifdef TMWSERV_SUPPORT
-#include "../net/gameserver/player.h"
+#include "../net/tmwserv/gameserver/player.h"
 #else
 #include "../net/messageout.h"
 #include "../net/ea/protocol.h"
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 84270d10..e4f560ce 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -42,7 +42,10 @@
 
 #include "../logindata.h"
 
-#include "../net/accountserver/account.h"
+#include "../net/tmwserv/accountserver/account.h"
+#include "../net/tmwserv/charserverhandler.h"
+#else
+#include "../net/ea/charserverhandler.h"
 #endif
 
 #include "widgets/layout.h"
@@ -52,7 +55,6 @@
 #include "../main.h"
 #include "../units.h"
 
-#include "../net/charserverhandler.h"
 #include "../net/messageout.h"
 
 #include "../resources/colordb.h"
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index f2651a02..a072704b 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -43,8 +43,8 @@
 #include "../localplayer.h"
 
 #ifdef TMWSERV_SUPPORT
-#include "../net/chatserver/chatserver.h"
-#include "../net/gameserver/player.h"
+#include "../net/tmwserv/chatserver/chatserver.h"
+#include "../net/tmwserv/gameserver/player.h"
 #else
 #include "../party.h"
 #include "../net/messageout.h"
diff --git a/src/gui/guildwindow.cpp b/src/gui/guildwindow.cpp
index 0596c75e..37d739e4 100644
--- a/src/gui/guildwindow.cpp
+++ b/src/gui/guildwindow.cpp
@@ -37,7 +37,7 @@
 #include "../log.h"
 #include "../localplayer.h"
 
-#include "../net/chatserver/guild.h"
+#include "../net/tmwserv/chatserver/guild.h"
 #include "../utils/dtor.h"
 #include "../utils/gettext.h"
 
diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp
index 3a72b21b..f8c0f4b2 100644
--- a/src/gui/npcpostdialog.cpp
+++ b/src/gui/npcpostdialog.cpp
@@ -26,7 +26,7 @@
 #include "scrollarea.h"
 #include "chat.h"
 
-#include "../net/gameserver/player.h"
+#include "../net/tmwserv/gameserver/player.h"
 #include "../utils/gettext.h"
 
 #include <guichan/widgets/label.hpp>
diff --git a/src/gui/partywindow.cpp b/src/gui/partywindow.cpp
index c4a1c780..d60974a8 100644
--- a/src/gui/partywindow.cpp
+++ b/src/gui/partywindow.cpp
@@ -25,7 +25,7 @@
 #include "widgets/avatar.h"
 
 #include "../utils/gettext.h"
-#include "../net/chatserver/party.h"
+#include "../net/tmwserv/chatserver/party.h"
 
 PartyWindow::PartyWindow() : Window(_("Party"))
 {
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index 957ff861..cab88560 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -35,7 +35,7 @@
 
 #include "../net/messageout.h"
 #ifdef TMWSERV_SUPPORT
-#include "../net/gameserver/player.h"
+#include "../net/tmwserv/gameserver/player.h"
 #else
 #include "../net/ea/protocol.h"
 #endif
diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
index 268b1baf..16965571 100644
--- a/src/gui/serverdialog.h
+++ b/src/gui/serverdialog.h
@@ -34,7 +34,7 @@
 
 #include "../guichanfwd.h"
 
-#include "../net/network.h"
+#include "../net/tmwserv/network.h"
 
 class LoginData;
 
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 98214a79..9910f4ce 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -41,7 +41,7 @@
 #include "../units.h"
 
 #ifdef TMWSERV_SUPPORT
-#include "../net/gameserver/player.h"
+#include "../net/tmwserv/gameserver/player.h"
 #else
 #include "../net/messageout.h"
 #include "../net/ea/protocol.h"