Move receive code from tradehandler into separate file.

4 files changed, 232 insertions, 140 deletions

diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index e7bd9e86f..9329844c9 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -43,7 +43,6 @@
 #include "debug.h"
 
 extern std::string tradePartnerName;
-ConfirmDialog *confirmDlg = nullptr;
 
 /**
  * Listener for request trade dialogs
@@ -66,132 +65,4 @@ void TradeHandler::removeItem(const int slotNum A_UNUSED,
 {
 }
 
-void TradeHandler::processTradeResponseContinue(const uint8_t type)
-{
-    switch (type)
-    {
-        case 0:  // Too far away
-            NotifyManager::notify(NotifyTypes::TRADE_FAIL_FAR_AWAY,
-                tradePartnerName);
-            break;
-        case 1:  // Character doesn't exist
-            NotifyManager::notify(NotifyTypes::TRADE_FAIL_CHAR_NOT_EXISTS,
-                tradePartnerName);
-            break;
-        case 2:  // Invite request check failed...
-            NotifyManager::notify(NotifyTypes::TRADE_CANCELLED_ERROR);
-            break;
-        case 3:  // Trade accepted
-            if (tradeWindow)
-            {
-                tradeWindow->reset();
-                // TRANSLATORS: trade header
-                tradeWindow->setCaption(strprintf(_("Trade: You and %s"),
-                    tradePartnerName.c_str()));
-                tradeWindow->initTrade(tradePartnerName);
-                tradeWindow->setVisible(Visible_true);
-            }
-            break;
-        case 4:  // Trade cancelled
-            if (player_relations.hasPermission(tradePartnerName,
-                PlayerRelation::SPEECH_LOG))
-            {
-                NotifyManager::notify(NotifyTypes::TRADE_CANCELLED_NAME,
-                    tradePartnerName);
-            }
-            // otherwise ignore silently
-
-            if (tradeWindow)
-            {
-                tradeWindow->setVisible(Visible_false);
-//                        tradeWindow->clear();
-            }
-            PlayerInfo::setTrading(Trading_false);
-            break;
-        case 5:
-            NotifyManager::notify(NotifyTypes::TRADE_CANCELLED_BUSY,
-                tradePartnerName);
-            break;
-        default:  // Shouldn't happen as well, but to be sure
-            NotifyManager::notify(NotifyTypes::TRADE_ERROR_UNKNOWN,
-                tradePartnerName);
-            if (tradeWindow)
-                tradeWindow->clear();
-            break;
-    }
-}
-
-void TradeHandler::processTradeOk(Net::MessageIn &msg)
-{
-    // 0 means ok from myself, 1 means ok from other;
-    if (tradeWindow)
-        tradeWindow->receivedOk(msg.readUInt8("status") == 0U);
-    else
-        msg.readUInt8("status");
-}
-
-void TradeHandler::processTradeCancel(Net::MessageIn &msg A_UNUSED)
-{
-    NotifyManager::notify(NotifyTypes::TRADE_CANCELLED);
-    if (tradeWindow)
-    {
-        tradeWindow->setVisible(Visible_false);
-        tradeWindow->reset();
-    }
-    PlayerInfo::setTrading(Trading_false);
-}
-
-void TradeHandler::processTradeComplete(Net::MessageIn &msg A_UNUSED)
-{
-    NotifyManager::notify(NotifyTypes::TRADE_COMPLETE);
-    if (tradeWindow)
-    {
-        tradeWindow->setVisible(Visible_false);
-        tradeWindow->reset();
-    }
-    PlayerInfo::setTrading(Trading_false);
-}
-
-void TradeHandler::processTradeRequestContinue(const std::string &partner)
-{
-    if (player_relations.hasPermission(partner,
-        PlayerRelation::TRADE))
-    {
-        if (PlayerInfo::isTrading() == Trading_true || confirmDlg)
-        {
-            tradeHandler->respond(false);
-            return;
-        }
-
-        tradePartnerName = partner;
-        PlayerInfo::setTrading(Trading_true);
-        if (tradeWindow)
-        {
-            if (tradePartnerName.empty() || tradeWindow->getAutoTradeNick()
-                != tradePartnerName)
-            {
-                tradeWindow->clear();
-                CREATEWIDGETV(confirmDlg, ConfirmDialog,
-                    // TRANSLATORS: trade message
-                    _("Request for Trade"),
-                    // TRANSLATORS: trade message
-                    strprintf(_("%s wants to trade with you, do"
-                    " you accept?"), tradePartnerName.c_str()),
-                    SOUND_REQUEST,
-                true);
-                confirmDlg->addActionListener(&listener);
-            }
-            else
-            {
-                tradeHandler->respond(true);
-            }
-        }
-    }
-    else
-    {
-        tradeHandler->respond(false);
-        return;
-    }
-}
-
 }  // namespace Ea
diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h
index 38c2bca4a..9540f19ee 100644
--- a/src/net/ea/tradehandler.h
+++ b/src/net/ea/tradehandler.h
@@ -42,17 +42,6 @@ class TradeHandler notfinal : public Net::TradeHandler
 
         void removeItem(const int slotNum,
                         const int amount) const override final;
-
-    protected:
-        static void processTradeOk(Net::MessageIn &msg);
-
-        static void processTradeCancel(Net::MessageIn &msg);
-
-        static void processTradeComplete(Net::MessageIn &msg);
-
-        static void processTradeRequestContinue(const std::string &partner);
-
-        static void processTradeResponseContinue(const uint8_t type);
 };
 
 }  // namespace Ea
diff --git a/src/net/ea/traderecv.cpp b/src/net/ea/traderecv.cpp
new file mode 100644
index 000000000..006c3a41f
--- /dev/null
+++ b/src/net/ea/traderecv.cpp
@@ -0,0 +1,187 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "net/ea/traderecv.h"
+
+#include "notifymanager.h"
+
+#include "being/playerinfo.h"
+#include "being/playerrelation.h"
+
+#include "enums/resources/notifytypes.h"
+
+#include "gui/windows/tradewindow.h"
+
+#include "gui/widgets/createwidget.h"
+
+#include "net/messagein.h"
+
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
+#include "listeners/requesttradelistener.h"
+
+#include "debug.h"
+
+extern std::string tradePartnerName;
+ConfirmDialog *confirmDlg = nullptr;
+
+/**
+ * Listener for request trade dialogs
+ */
+namespace
+{
+    RequestTradeListener listener;
+}  // namespace
+
+namespace Ea
+{
+
+void TradeRecv::processTradeResponseContinue(const uint8_t type)
+{
+    switch (type)
+    {
+        case 0:  // Too far away
+            NotifyManager::notify(NotifyTypes::TRADE_FAIL_FAR_AWAY,
+                tradePartnerName);
+            break;
+        case 1:  // Character doesn't exist
+            NotifyManager::notify(NotifyTypes::TRADE_FAIL_CHAR_NOT_EXISTS,
+                tradePartnerName);
+            break;
+        case 2:  // Invite request check failed...
+            NotifyManager::notify(NotifyTypes::TRADE_CANCELLED_ERROR);
+            break;
+        case 3:  // Trade accepted
+            if (tradeWindow)
+            {
+                tradeWindow->reset();
+                // TRANSLATORS: trade header
+                tradeWindow->setCaption(strprintf(_("Trade: You and %s"),
+                    tradePartnerName.c_str()));
+                tradeWindow->initTrade(tradePartnerName);
+                tradeWindow->setVisible(Visible_true);
+            }
+            break;
+        case 4:  // Trade cancelled
+            if (player_relations.hasPermission(tradePartnerName,
+                PlayerRelation::SPEECH_LOG))
+            {
+                NotifyManager::notify(NotifyTypes::TRADE_CANCELLED_NAME,
+                    tradePartnerName);
+            }
+            // otherwise ignore silently
+
+            if (tradeWindow)
+            {
+                tradeWindow->setVisible(Visible_false);
+//                        tradeWindow->clear();
+            }
+            PlayerInfo::setTrading(Trading_false);
+            break;
+        case 5:
+            NotifyManager::notify(NotifyTypes::TRADE_CANCELLED_BUSY,
+                tradePartnerName);
+            break;
+        default:  // Shouldn't happen as well, but to be sure
+            NotifyManager::notify(NotifyTypes::TRADE_ERROR_UNKNOWN,
+                tradePartnerName);
+            if (tradeWindow)
+                tradeWindow->clear();
+            break;
+    }
+}
+
+void TradeRecv::processTradeOk(Net::MessageIn &msg)
+{
+    // 0 means ok from myself, 1 means ok from other;
+    if (tradeWindow)
+        tradeWindow->receivedOk(msg.readUInt8("status") == 0U);
+    else
+        msg.readUInt8("status");
+}
+
+void TradeRecv::processTradeCancel(Net::MessageIn &msg A_UNUSED)
+{
+    NotifyManager::notify(NotifyTypes::TRADE_CANCELLED);
+    if (tradeWindow)
+    {
+        tradeWindow->setVisible(Visible_false);
+        tradeWindow->reset();
+    }
+    PlayerInfo::setTrading(Trading_false);
+}
+
+void TradeRecv::processTradeComplete(Net::MessageIn &msg A_UNUSED)
+{
+    NotifyManager::notify(NotifyTypes::TRADE_COMPLETE);
+    if (tradeWindow)
+    {
+        tradeWindow->setVisible(Visible_false);
+        tradeWindow->reset();
+    }
+    PlayerInfo::setTrading(Trading_false);
+}
+
+void TradeRecv::processTradeRequestContinue(const std::string &partner)
+{
+    if (player_relations.hasPermission(partner,
+        PlayerRelation::TRADE))
+    {
+        if (PlayerInfo::isTrading() == Trading_true || confirmDlg)
+        {
+            tradeHandler->respond(false);
+            return;
+        }
+
+        tradePartnerName = partner;
+        PlayerInfo::setTrading(Trading_true);
+        if (tradeWindow)
+        {
+            if (tradePartnerName.empty() || tradeWindow->getAutoTradeNick()
+                != tradePartnerName)
+            {
+                tradeWindow->clear();
+                CREATEWIDGETV(confirmDlg, ConfirmDialog,
+                    // TRANSLATORS: trade message
+                    _("Request for Trade"),
+                    // TRANSLATORS: trade message
+                    strprintf(_("%s wants to trade with you, do"
+                    " you accept?"), tradePartnerName.c_str()),
+                    SOUND_REQUEST,
+                true);
+                confirmDlg->addActionListener(&listener);
+            }
+            else
+            {
+                tradeHandler->respond(true);
+            }
+        }
+    }
+    else
+    {
+        tradeHandler->respond(false);
+        return;
+    }
+}
+
+}  // namespace Ea
diff --git a/src/net/ea/traderecv.h b/src/net/ea/traderecv.h
new file mode 100644
index 000000000..2d388a135
--- /dev/null
+++ b/src/net/ea/traderecv.h
@@ -0,0 +1,45 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_EA_TRADERECV_H
+#define NET_EA_TRADERECV_H
+
+#include "net/tradehandler.h"
+
+namespace Net
+{
+    class MessageIn;
+}
+
+namespace Ea
+{
+    namespace TradeRecv
+    {
+        void processTradeOk(Net::MessageIn &msg);
+        void processTradeCancel(Net::MessageIn &msg);
+        void processTradeComplete(Net::MessageIn &msg);
+        void processTradeRequestContinue(const std::string &partner);
+        void processTradeResponseContinue(const uint8_t type);
+    } // namespace TradeRecv
+}  // namespace Ea
+
+#endif  // NET_EA_TRADERECV_H