Move receive code from partyhandler into separate file.

4 files changed, 356 insertions, 276 deletions

diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 92e26ec81..90fbee9d3 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -34,7 +34,10 @@
 
 #include "gui/widgets/tabs/chat/partytab.h"
 
+#include "net/ea/partyrecv.h"
+
 #include "net/tmwa/messageout.h"
+#include "net/tmwa/partyrecv.h"
 #include "net/tmwa/protocol.h"
 
 #include "debug.h"
@@ -76,34 +79,34 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
     switch (msg.getId())
     {
         case SMSG_PARTY_CREATE:
-            processPartyCreate(msg);
+            Ea::PartyRecv::processPartyCreate(msg);
             break;
         case SMSG_PARTY_INFO:
-            processPartyInfo(msg);
+            PartyRecv::processPartyInfo(msg);
             break;
         case SMSG_PARTY_INVITE_RESPONSE:
-            processPartyInviteResponse(msg);
+            PartyRecv::processPartyInviteResponse(msg);
             break;
         case SMSG_PARTY_INVITED:
-            processPartyInvited(msg);
+            PartyRecv::processPartyInvited(msg);
             break;
         case SMSG_PARTY_SETTINGS:
-            processPartySettings(msg);
+            PartyRecv::processPartySettings(msg);
             break;
         case SMSG_PARTY_MOVE:
-            processPartyMove(msg);
+            PartyRecv::processPartyMove(msg);
             break;
         case SMSG_PARTY_LEAVE:
-            processPartyLeave(msg);
+            Ea::PartyRecv::processPartyLeave(msg);
             break;
         case SMSG_PARTY_UPDATE_HP:
-            processPartyUpdateHp(msg);
+            PartyRecv::processPartyUpdateHp(msg);
             break;
         case SMSG_PARTY_UPDATE_COORDS:
-            processPartyUpdateCoords(msg);
+            Ea::PartyRecv::processPartyUpdateCoords(msg);
             break;
         case SMSG_PARTY_MESSAGE:
-            processPartyMessage(msg);
+            PartyRecv::processPartyMessage(msg);
             break;
 
         default:
@@ -189,7 +192,8 @@ void PartyHandler::setShareExperience(const PartyShareT share) const
 
     createOutPacket(CMSG_PARTY_SETTINGS);
     outMsg.writeInt16(static_cast<int16_t>(share), "share exp");
-    outMsg.writeInt16(static_cast<int16_t>(mShareItems), "share items");
+    outMsg.writeInt16(static_cast<int16_t>(Ea::PartyRecv::mShareItems),
+        "share items");
 }
 
 void PartyHandler::setShareItems(const PartyShareT share) const
@@ -198,185 +202,11 @@ void PartyHandler::setShareItems(const PartyShareT share) const
         return;
 
     createOutPacket(CMSG_PARTY_SETTINGS);
-    outMsg.writeInt16(static_cast<int16_t>(mShareExp), "share exp");
+    outMsg.writeInt16(static_cast<int16_t>(Ea::PartyRecv::mShareExp),
+        "share exp");
     outMsg.writeInt16(static_cast<int16_t>(share), "share items");
 }
 
-void PartyHandler::processPartySettings(Net::MessageIn &msg)
-{
-    if (!partyTab)
-    {
-        if (!chatWindow)
-            return;
-
-        createTab();
-    }
-
-    // These seem to indicate the sharing mode for exp and items
-    const PartyShareT exp = static_cast<PartyShareT>(
-        msg.readInt16("share exp"));
-    const PartyShareT item = static_cast<PartyShareT>(
-        msg.readInt16("share items"));
-    processPartySettingsContinue(msg, exp, item);
-}
-
-void PartyHandler::processPartyInfo(Net::MessageIn &msg)
-{
-    bool isOldParty = false;
-    std::set<std::string> names;
-    std::set<std::string> onlineNames;
-    if (!Ea::taParty)
-    {
-        logger->log1("error: party empty in SMSG_PARTY_INFO");
-        Ea::taParty = Party::getParty(1);
-    }
-    if (Ea::taParty)
-    {
-        if (Ea::taParty->getNumberOfElements() > 1)
-        {
-            isOldParty = true;
-            Ea::taParty->getNamesSet(names);
-            const Party::MemberList *const members = Ea::taParty->getMembers();
-            FOR_EACHP (Party::MemberList::const_iterator, it, members)
-            {
-                if ((*it)->getOnline())
-                    onlineNames.insert((*it)->getName());
-            }
-            if (localPlayer)
-                onlineNames.insert(localPlayer->getName());
-        }
-    }
-
-    if (!localPlayer)
-        logger->log1("error: localPlayer==0 in SMSG_PARTY_INFO");
-
-    if (Ea::taParty)
-        Ea::taParty->clearMembers();
-
-    const int length = msg.readInt16("len");
-    if (Ea::taParty)
-        Ea::taParty->setName(msg.readString(24, "party name"));
-
-    const int count = (length - 28) / 46;
-    if (localPlayer && Ea::taParty)
-    {
-        localPlayer->setParty(Ea::taParty);
-        localPlayer->setPartyName(Ea::taParty->getName());
-    }
-
-    for (int i = 0; i < count; i++)
-    {
-        const BeingId id = msg.readBeingId("id");
-        std::string nick = msg.readString(24, "nick");
-        std::string map = msg.readString(16, "map");
-        const bool leader = msg.readUInt8("leader") == 0U;
-        const bool online = msg.readUInt8("online") == 0U;
-
-        if (Ea::taParty)
-        {
-            bool joined(false);
-
-            if (isOldParty)
-            {
-                if (names.find(nick) == names.end())
-                {
-                    NotifyManager::notify(NotifyTypes::PARTY_USER_JOINED,
-                        nick);
-                    joined = true;
-                }
-            }
-            PartyMember *const member = Ea::taParty->addMember(id, nick);
-            if (member)
-            {
-                if (!joined && partyTab)
-                {
-                    if (!names.empty() && ((onlineNames.find(nick)
-                        == onlineNames.end() && online)
-                        || (onlineNames.find(nick) != onlineNames.end()
-                        && !online)))
-                    {
-                        partyTab->showOnline(nick, fromBool(online, Online));
-                    }
-
-                    member->setLeader(leader);
-                    member->setOnline(online);
-                    member->setMap(map);
-                }
-                else
-                {
-                    member->setLeader(leader);
-                    member->setOnline(online);
-                    member->setMap(map);
-                }
-            }
-        }
-    }
-
-    if (Ea::taParty)
-        Ea::taParty->sort();
-
-    if (localPlayer && Ea::taParty)
-    {
-        localPlayer->setParty(Ea::taParty);
-        localPlayer->setPartyName(Ea::taParty->getName());
-        if (socialWindow)
-            socialWindow->updateParty();
-    }
-}
-
-void PartyHandler::processPartyMessage(Net::MessageIn &msg)
-{
-    const int msgLength = msg.readInt16("len") - 8;
-    if (msgLength <= 0)
-        return;
-
-    const BeingId id = msg.readBeingId("id");
-    const std::string chatMsg = msg.readString(msgLength, "message");
-
-    if (Ea::taParty && partyTab)
-    {
-        const PartyMember *const member = Ea::taParty->getMember(id);
-        if (member)
-        {
-            partyTab->chatLog(member->getName(), chatMsg);
-        }
-        else
-        {
-            NotifyManager::notify(NotifyTypes::PARTY_UNKNOWN_USER_MSG,
-                chatMsg);
-        }
-    }
-}
-
-void PartyHandler::processPartyInviteResponse(Net::MessageIn &msg)
-{
-    if (!partyTab)
-        return;
-
-    const std::string nick = msg.readString(24, "nick");
-
-    switch (msg.readUInt8("status"))
-    {
-        case 0:
-            NotifyManager::notify(NotifyTypes::PARTY_INVITE_ALREADY_MEMBER,
-                nick);
-            break;
-        case 1:
-            NotifyManager::notify(NotifyTypes::PARTY_INVITE_REFUSED, nick);
-            break;
-        case 2:
-            NotifyManager::notify(NotifyTypes::PARTY_INVITE_DONE, nick);
-            break;
-        case 3:
-            NotifyManager::notify(NotifyTypes::PARTY_INVITE_PARTY_FULL,
-                nick);
-            break;
-        default:
-            NotifyManager::notify(NotifyTypes::PARTY_INVITE_ERROR, nick);
-            break;
-    }
-}
-
 void PartyHandler::changeLeader(const std::string &name A_UNUSED) const
 {
 }
@@ -385,78 +215,4 @@ void PartyHandler::allowInvite(const bool allow A_UNUSED) const
 {
 }
 
-void PartyHandler::processPartyInvited(Net::MessageIn &msg)
-{
-    const BeingId id = msg.readBeingId("account id");
-    const std::string partyName = msg.readString(24, "party name");
-    std::string nick;
-
-    if (actorManager)
-    {
-        const Being *const being = actorManager->findBeing(id);
-        if (being)
-        {
-            if (being->getType() == ActorType::Player)
-                nick = being->getName();
-        }
-    }
-
-    if (socialWindow)
-        socialWindow->showPartyInvite(partyName, nick, 0);
-}
-
-void PartyHandler::processPartyMove(Net::MessageIn &msg)
-{
-    const BeingId id = msg.readBeingId("id");
-    PartyMember *m = nullptr;
-    if (Ea::taParty)
-        m = Ea::taParty->getMember(id);
-    if (m)
-    {
-        msg.readInt32("unused");
-        m->setX(msg.readInt16("x"));
-        m->setY(msg.readInt16("y"));
-        const bool online = msg.readUInt8("online") != 0;
-        if (m->getOnline() != online)
-            partyTab->showOnline(m->getName(), fromBool(online, Online));
-        m->setOnline(online);
-        msg.readString(24, "party");
-        msg.readString(24, "nick");
-        m->setMap(msg.readString(16, "map"));
-    }
-    else
-    {
-        msg.readInt32("unused");
-        msg.readInt16("x");
-        msg.readInt16("y");
-        msg.readUInt8("online");
-        msg.readString(24, "party");
-        msg.readString(24, "nick");
-        msg.readString(16, "map");
-    }
-}
-
-void PartyHandler::processPartyUpdateHp(Net::MessageIn &msg)
-{
-    const BeingId id = msg.readBeingId("id");
-    const int hp = msg.readInt16("hp");
-    const int maxhp = msg.readInt16("max hp");
-    PartyMember *m = nullptr;
-    if (Ea::taParty)
-        m = Ea::taParty->getMember(id);
-    if (m)
-    {
-        m->setHp(hp);
-        m->setMaxHp(maxhp);
-    }
-
-    // The server only sends this when the member is in range, so
-    // lets make sure they get the party hilight.
-    if (actorManager && Ea::taParty)
-    {
-        if (Being *const b = actorManager->findBeing(id))
-            b->setParty(Ea::taParty);
-    }
-}
-
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index 30c837c37..47fe9c232 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -62,21 +62,6 @@ class PartyHandler final : public MessageHandler, public Ea::PartyHandler
         void changeLeader(const std::string &name) const override final;
 
         void allowInvite(const bool allow) const override final;
-
-    protected:
-        static void processPartySettings(Net::MessageIn &msg);
-
-        static void processPartyInfo(Net::MessageIn &msg);
-
-        static void processPartyMessage(Net::MessageIn &msg);
-
-        static void processPartyInviteResponse(Net::MessageIn &msg);
-
-        static void processPartyInvited(Net::MessageIn &msg);
-
-        static void processPartyMove(Net::MessageIn &msg);
-
-        static void processPartyUpdateHp(Net::MessageIn &msg);
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/partyrecv.cpp b/src/net/tmwa/partyrecv.cpp
new file mode 100644
index 000000000..eaee64943
--- /dev/null
+++ b/src/net/tmwa/partyrecv.cpp
@@ -0,0 +1,296 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2008  Lloyd Bryant <lloyd_bryant@netzero.net>
+ *  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/tmwa/partyrecv.h"
+
+#include "actormanager.h"
+#include "notifymanager.h"
+#include "party.h"
+
+#include "being/localplayer.h"
+
+#include "enums/resources/notifytypes.h"
+
+#include "gui/windows/chatwindow.h"
+#include "gui/windows/socialwindow.h"
+
+#include "gui/widgets/tabs/chat/partytab.h"
+
+#include "net/ea/partyrecv.h"
+
+#include "net/tmwa/messageout.h"
+#include "net/tmwa/protocol.h"
+
+#include "debug.h"
+
+namespace TmwAthena
+{
+
+void PartyRecv::processPartySettings(Net::MessageIn &msg)
+{
+    if (!partyTab)
+    {
+        if (!chatWindow)
+            return;
+
+        Ea::PartyRecv::createTab();
+    }
+
+    // These seem to indicate the sharing mode for exp and items
+    const PartyShareT exp = static_cast<PartyShareT>(
+        msg.readInt16("share exp"));
+    const PartyShareT item = static_cast<PartyShareT>(
+        msg.readInt16("share items"));
+    Ea::PartyRecv::processPartySettingsContinue(msg, exp, item);
+}
+
+void PartyRecv::processPartyInfo(Net::MessageIn &msg)
+{
+    bool isOldParty = false;
+    std::set<std::string> names;
+    std::set<std::string> onlineNames;
+    if (!Ea::taParty)
+    {
+        logger->log1("error: party empty in SMSG_PARTY_INFO");
+        Ea::taParty = Party::getParty(1);
+    }
+    if (Ea::taParty)
+    {
+        if (Ea::taParty->getNumberOfElements() > 1)
+        {
+            isOldParty = true;
+            Ea::taParty->getNamesSet(names);
+            const Party::MemberList *const members = Ea::taParty->getMembers();
+            FOR_EACHP (Party::MemberList::const_iterator, it, members)
+            {
+                if ((*it)->getOnline())
+                    onlineNames.insert((*it)->getName());
+            }
+            if (localPlayer)
+                onlineNames.insert(localPlayer->getName());
+        }
+    }
+
+    if (!localPlayer)
+        logger->log1("error: localPlayer==0 in SMSG_PARTY_INFO");
+
+    if (Ea::taParty)
+        Ea::taParty->clearMembers();
+
+    const int length = msg.readInt16("len");
+    if (Ea::taParty)
+        Ea::taParty->setName(msg.readString(24, "party name"));
+
+    const int count = (length - 28) / 46;
+    if (localPlayer && Ea::taParty)
+    {
+        localPlayer->setParty(Ea::taParty);
+        localPlayer->setPartyName(Ea::taParty->getName());
+    }
+
+    for (int i = 0; i < count; i++)
+    {
+        const BeingId id = msg.readBeingId("id");
+        std::string nick = msg.readString(24, "nick");
+        std::string map = msg.readString(16, "map");
+        const bool leader = msg.readUInt8("leader") == 0U;
+        const bool online = msg.readUInt8("online") == 0U;
+
+        if (Ea::taParty)
+        {
+            bool joined(false);
+
+            if (isOldParty)
+            {
+                if (names.find(nick) == names.end())
+                {
+                    NotifyManager::notify(NotifyTypes::PARTY_USER_JOINED,
+                        nick);
+                    joined = true;
+                }
+            }
+            PartyMember *const member = Ea::taParty->addMember(id, nick);
+            if (member)
+            {
+                if (!joined && partyTab)
+                {
+                    if (!names.empty() && ((onlineNames.find(nick)
+                        == onlineNames.end() && online)
+                        || (onlineNames.find(nick) != onlineNames.end()
+                        && !online)))
+                    {
+                        partyTab->showOnline(nick, fromBool(online, Online));
+                    }
+
+                    member->setLeader(leader);
+                    member->setOnline(online);
+                    member->setMap(map);
+                }
+                else
+                {
+                    member->setLeader(leader);
+                    member->setOnline(online);
+                    member->setMap(map);
+                }
+            }
+        }
+    }
+
+    if (Ea::taParty)
+        Ea::taParty->sort();
+
+    if (localPlayer && Ea::taParty)
+    {
+        localPlayer->setParty(Ea::taParty);
+        localPlayer->setPartyName(Ea::taParty->getName());
+        if (socialWindow)
+            socialWindow->updateParty();
+    }
+}
+
+void PartyRecv::processPartyMessage(Net::MessageIn &msg)
+{
+    const int msgLength = msg.readInt16("len") - 8;
+    if (msgLength <= 0)
+        return;
+
+    const BeingId id = msg.readBeingId("id");
+    const std::string chatMsg = msg.readString(msgLength, "message");
+
+    if (Ea::taParty && partyTab)
+    {
+        const PartyMember *const member = Ea::taParty->getMember(id);
+        if (member)
+        {
+            partyTab->chatLog(member->getName(), chatMsg);
+        }
+        else
+        {
+            NotifyManager::notify(NotifyTypes::PARTY_UNKNOWN_USER_MSG,
+                chatMsg);
+        }
+    }
+}
+
+void PartyRecv::processPartyInviteResponse(Net::MessageIn &msg)
+{
+    if (!partyTab)
+        return;
+
+    const std::string nick = msg.readString(24, "nick");
+
+    switch (msg.readUInt8("status"))
+    {
+        case 0:
+            NotifyManager::notify(NotifyTypes::PARTY_INVITE_ALREADY_MEMBER,
+                nick);
+            break;
+        case 1:
+            NotifyManager::notify(NotifyTypes::PARTY_INVITE_REFUSED, nick);
+            break;
+        case 2:
+            NotifyManager::notify(NotifyTypes::PARTY_INVITE_DONE, nick);
+            break;
+        case 3:
+            NotifyManager::notify(NotifyTypes::PARTY_INVITE_PARTY_FULL,
+                nick);
+            break;
+        default:
+            NotifyManager::notify(NotifyTypes::PARTY_INVITE_ERROR, nick);
+            break;
+    }
+}
+
+void PartyRecv::processPartyInvited(Net::MessageIn &msg)
+{
+    const BeingId id = msg.readBeingId("account id");
+    const std::string partyName = msg.readString(24, "party name");
+    std::string nick;
+
+    if (actorManager)
+    {
+        const Being *const being = actorManager->findBeing(id);
+        if (being)
+        {
+            if (being->getType() == ActorType::Player)
+                nick = being->getName();
+        }
+    }
+
+    if (socialWindow)
+        socialWindow->showPartyInvite(partyName, nick, 0);
+}
+
+void PartyRecv::processPartyMove(Net::MessageIn &msg)
+{
+    const BeingId id = msg.readBeingId("id");
+    PartyMember *m = nullptr;
+    if (Ea::taParty)
+        m = Ea::taParty->getMember(id);
+    if (m)
+    {
+        msg.readInt32("unused");
+        m->setX(msg.readInt16("x"));
+        m->setY(msg.readInt16("y"));
+        const bool online = msg.readUInt8("online") != 0;
+        if (m->getOnline() != online)
+            partyTab->showOnline(m->getName(), fromBool(online, Online));
+        m->setOnline(online);
+        msg.readString(24, "party");
+        msg.readString(24, "nick");
+        m->setMap(msg.readString(16, "map"));
+    }
+    else
+    {
+        msg.readInt32("unused");
+        msg.readInt16("x");
+        msg.readInt16("y");
+        msg.readUInt8("online");
+        msg.readString(24, "party");
+        msg.readString(24, "nick");
+        msg.readString(16, "map");
+    }
+}
+
+void PartyRecv::processPartyUpdateHp(Net::MessageIn &msg)
+{
+    const BeingId id = msg.readBeingId("id");
+    const int hp = msg.readInt16("hp");
+    const int maxhp = msg.readInt16("max hp");
+    PartyMember *m = nullptr;
+    if (Ea::taParty)
+        m = Ea::taParty->getMember(id);
+    if (m)
+    {
+        m->setHp(hp);
+        m->setMaxHp(maxhp);
+    }
+
+    // The server only sends this when the member is in range, so
+    // lets make sure they get the party hilight.
+    if (actorManager && Ea::taParty)
+    {
+        if (Being *const b = actorManager->findBeing(id))
+            b->setParty(Ea::taParty);
+    }
+}
+
+}  // namespace TmwAthena
diff --git a/src/net/tmwa/partyrecv.h b/src/net/tmwa/partyrecv.h
new file mode 100644
index 000000000..0d94cd738
--- /dev/null
+++ b/src/net/tmwa/partyrecv.h
@@ -0,0 +1,43 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2008  Lloyd Bryant <lloyd_bryant@netzero.net>
+ *  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_TMWA_PARTYRECV_H
+#define NET_TMWA_PARTYRECV_H
+
+#include "net/tmwa/messagehandler.h"
+
+#include "net/ea/partyhandler.h"
+
+namespace TmwAthena
+{
+    namespace PartyRecv
+    {
+        void processPartySettings(Net::MessageIn &msg);
+        void processPartyInfo(Net::MessageIn &msg);
+        void processPartyMessage(Net::MessageIn &msg);
+        void processPartyInviteResponse(Net::MessageIn &msg);
+        void processPartyInvited(Net::MessageIn &msg);
+        void processPartyMove(Net::MessageIn &msg);
+        void processPartyUpdateHp(Net::MessageIn &msg);
+    }  // namespace PartyRecv
+}  // namespace TmwAthena
+
+#endif  // NET_TMWA_PARTYRECV_H