summaryrefslogtreecommitdiff
path: root/src/net/tmwserv
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-03-27 13:12:24 -0600
committerJared Adams <jaxad0127@gmail.com>2009-03-27 13:13:03 -0600
commit74f23fd3d0e1fb3be8e5419193d57d91746c887a (patch)
tree2715ae060ccd76f1b472dee3b9086e169d0e6926 /src/net/tmwserv
parent795cec6e276e7f5df8a25bd8306e6fd87c826502 (diff)
downloadmana-74f23fd3d0e1fb3be8e5419193d57d91746c887a.tar.gz
mana-74f23fd3d0e1fb3be8e5419193d57d91746c887a.tar.bz2
mana-74f23fd3d0e1fb3be8e5419193d57d91746c887a.tar.xz
mana-74f23fd3d0e1fb3be8e5419193d57d91746c887a.zip
Clean up chat and chat tabs some more
Diffstat (limited to 'src/net/tmwserv')
-rw-r--r--src/net/tmwserv/partyhandler.cpp3
-rw-r--r--src/net/tmwserv/tradehandler.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/net/tmwserv/partyhandler.cpp b/src/net/tmwserv/partyhandler.cpp
index dfbcea80..510eb77a 100644
--- a/src/net/tmwserv/partyhandler.cpp
+++ b/src/net/tmwserv/partyhandler.cpp
@@ -26,9 +26,10 @@
#include "net/messagein.h"
-#include "gui/chat.h"
#include "gui/partywindow.h"
+#include "gui/widgets/chattab.h"
+
#include "log.h"
#include "localplayer.h"
diff --git a/src/net/tmwserv/tradehandler.cpp b/src/net/tmwserv/tradehandler.cpp
index 85228355..8b3e06c6 100644
--- a/src/net/tmwserv/tradehandler.cpp
+++ b/src/net/tmwserv/tradehandler.cpp
@@ -30,10 +30,11 @@
#include "item.h"
#include "localplayer.h"
-#include "gui/chat.h"
#include "gui/confirm_dialog.h"
#include "gui/trade.h"
+#include "gui/widgets/chattab.h"
+
std::string tradePartnerName;
int tradePartnerID;