Move the majority of the netcode's server messages to the event system

There is still a good way to go, but this should get us
started

Reviewed-by: Jared Adams

1 files changed, 7 insertions, 8 deletions

diff --git a/src/net/manaserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp
index d5505075..5f9fa83e 100644
--- a/src/net/manaserv/tradehandler.cpp
+++ b/src/net/manaserv/tradehandler.cpp
@@ -22,6 +22,8 @@
 #include "net/manaserv/tradehandler.h"
 
 #include "actorspritemanager.h"
+#include "event.h"
+#include "eventmanager.h"
 #include "item.h"
 #include "localplayer.h"
 #include "playerinfo.h"
@@ -29,8 +31,6 @@
 #include "gui/confirmdialog.h"
 #include "gui/trade.h"
 
-#include "gui/widgets/chattab.h"
-
 #include "net/net.h"
 
 #include "net/manaserv/connection.h"
@@ -87,16 +87,15 @@ TradeHandler::TradeHandler():
     };
     handledMessages = _messages;
     tradeHandler = this;
-    
 }
 
 void TradeHandler::setAcceptTradeRequests(bool acceptTradeRequests)
 {
     mAcceptTradeRequests = acceptTradeRequests;
     if (mAcceptTradeRequests)
-        localChatTab->chatLog(_("Accepting incoming trade requests."), BY_SERVER);
+        SERVER_NOTICE(_("Accepting incoming trade requests."))
     else
-        localChatTab->chatLog(_("Ignoring incoming trade requests."), BY_SERVER);
+        SERVER_NOTICE(_("Ignoring incoming trade requests."))
 }
 
 void TradeHandler::handleMessage(Net::MessageIn &msg)
@@ -145,16 +144,16 @@ void TradeHandler::handleMessage(Net::MessageIn &msg)
         case GPMSG_TRADE_AGREED:
             tradeWindow->receivedOk(false);
             break;
-            
+
         case GPMSG_TRADE_CANCEL:
-            localChatTab->chatLog(_("Trade canceled."), BY_SERVER);
+            SERVER_NOTICE(_("Trade canceled."))
             tradeWindow->setVisible(false);
             tradeWindow->reset();
             PlayerInfo::setTrading(false);
             break;
 
         case GPMSG_TRADE_COMPLETE:
-            localChatTab->chatLog(_("Trade completed."), BY_SERVER);
+            SERVER_NOTICE(_("Trade completed."))
             tradeWindow->setVisible(false);
             tradeWindow->reset();
             PlayerInfo::setTrading(false);