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

3 files changed, 20 insertions, 19 deletions

diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp
index 1fbfdf21..b5d7e7bd 100644
--- a/src/net/manaserv/guildhandler.cpp
+++ b/src/net/manaserv/guildhandler.cpp
@@ -21,6 +21,8 @@
 
 #include "net/manaserv/guildhandler.h"
 
+#include "event.h"
+#include "eventmanager.h"
 #include "guild.h"
 #include "log.h"
 #include "localplayer.h"
@@ -78,12 +80,12 @@ void GuildHandler::handleMessage(Net::MessageIn &msg)
             if (msg.readInt8() == ERRMSG_OK)
             {
                 // TODO - Acknowledge guild was created
-                localChatTab->chatLog(_("Guild created."));
+                SERVER_NOTICE(_("Guild created."))
                 joinedGuild(msg);
             }
             else
             {
-                localChatTab->chatLog(_("Error creating guild."));
+                SERVER_NOTICE(_("Error creating guild."))
             }
         } break;
 
@@ -93,7 +95,7 @@ void GuildHandler::handleMessage(Net::MessageIn &msg)
             if (msg.readInt8() == ERRMSG_OK)
             {
                 // TODO - Acknowledge invite was sent
-                localChatTab->chatLog(_("Invite sent."));
+                SERVER_NOTICE(_("Invite sent."))
             }
         } break;
 
@@ -200,12 +202,12 @@ void GuildHandler::handleMessage(Net::MessageIn &msg)
             if (msg.readInt8() == ERRMSG_OK)
             {
                 // promotion succeeded
-                localChatTab->chatLog(_("Member was promoted successfully."));
+                SERVER_NOTICE(_("Member was promoted successfully."))
             }
             else
             {
                 // promotion failed
-                localChatTab->chatLog(_("Failed to promote member."));
+                SERVER_NOTICE(_("Failed to promote member."))
             }
         }
 
diff --git a/src/net/manaserv/partyhandler.cpp b/src/net/manaserv/partyhandler.cpp
index 2fd48f57..a9145269 100644
--- a/src/net/manaserv/partyhandler.cpp
+++ b/src/net/manaserv/partyhandler.cpp
@@ -21,13 +21,13 @@
 
 #include "net/manaserv/partyhandler.h"
 
+#include "event.h"
+#include "eventmanager.h"
 #include "log.h"
 #include "localplayer.h"
 
 #include "gui/socialwindow.h"
 
-#include "gui/widgets/chattab.h"
-
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messagein.h"
 #include "net/manaserv/messageout.h"
@@ -85,7 +85,7 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
             if (msg.readInt8() == ERRMSG_OK)
             {
                 //
-                localChatTab->chatLog(_("Joined party."));
+                SERVER_NOTICE(_("Joined party."));
             }
         }
 
@@ -103,7 +103,7 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
             int id = msg.readInt16(); // being id
             std::string name = msg.readString();
 
-            localChatTab->chatLog(strprintf(_("%s joined the party."),
+            SERVER_NOTICE(strprintf(_("%s joined the party."),
                                             name.c_str()));
 
             if (id == player_node->getId())
@@ -120,8 +120,8 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
         case CPMSG_PARTY_REJECTED:
         {
             std::string name = msg.readString();
-            localChatTab->chatLog(strprintf(_("%s rejected your invite."),
-                                            name.c_str()));
+            SERVER_NOTICE(strprintf(
+                        _("%s rejected your invite."), name.c_str()));
         } break;
     }
 }
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);