From 8438ad4513e9aa2af4b42317aa05358e36f06e98 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 13 Dec 2014 23:35:11 +0300
Subject: Move processPartyInvited from ea namespace into eathena and tmwa.

---
 src/net/ea/partyhandler.cpp      | 20 --------------------
 src/net/ea/partyhandler.h        |  2 --
 src/net/eathena/partyhandler.cpp | 20 ++++++++++++++++++++
 src/net/eathena/partyhandler.h   |  2 ++
 src/net/tmwa/partyhandler.cpp    | 20 ++++++++++++++++++++
 src/net/tmwa/partyhandler.h      |  2 ++
 6 files changed, 44 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 20bb93a5c..76b08f6bb 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -83,26 +83,6 @@ void PartyHandler::processPartyCreate(Net::MessageIn &msg)
         NotifyManager::notify(NotifyTypes::PARTY_CREATED);
 }
 
-void PartyHandler::processPartyInvited(Net::MessageIn &msg)
-{
-    const int id = msg.readInt32("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);
-}
-
 void PartyHandler::processPartySettingsContinue(const int16_t exp,
                                                 const int16_t item)
 {
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index c415ac4b5..7dc0e6664 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -63,8 +63,6 @@ class PartyHandler notfinal : public Net::PartyHandler
 
         static void processPartyCreate(Net::MessageIn &msg);
 
-        static void processPartyInvited(Net::MessageIn &msg);
-
         static void processPartyMove(Net::MessageIn &msg);
 
         static void processPartyLeave(Net::MessageIn &msg);
diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp
index 1751140a5..452cf1408 100644
--- a/src/net/eathena/partyhandler.cpp
+++ b/src/net/eathena/partyhandler.cpp
@@ -497,4 +497,24 @@ void PartyHandler::processPartyLeader(Net::MessageIn &msg)
         newMember->setLeader(true);
 }
 
+void PartyHandler::processPartyInvited(Net::MessageIn &msg)
+{
+    const int id = msg.readInt32("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);
+}
+
 }  // namespace EAthena
diff --git a/src/net/eathena/partyhandler.h b/src/net/eathena/partyhandler.h
index c4bab0f47..f389bcb42 100644
--- a/src/net/eathena/partyhandler.h
+++ b/src/net/eathena/partyhandler.h
@@ -81,6 +81,8 @@ class PartyHandler final : public MessageHandler, public Ea::PartyHandler
         static void processPartyItemPickup(Net::MessageIn &msg);
 
         static void processPartyLeader(Net::MessageIn &msg);
+
+        static void processPartyInvited(Net::MessageIn &msg);
 };
 
 }  // namespace EAthena
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 7cf5cef3e..5762503c7 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -383,4 +383,24 @@ void PartyHandler::allowInvite(const bool allow A_UNUSED) const
 {
 }
 
+void PartyHandler::processPartyInvited(Net::MessageIn &msg)
+{
+    const int id = msg.readInt32("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);
+}
+
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index a6fdfdddf..a29f03718 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -73,6 +73,8 @@ class PartyHandler final : public MessageHandler, public Ea::PartyHandler
         static void processPartyMessage(Net::MessageIn &msg);
 
         static void processPartyInviteResponse(Net::MessageIn &msg);
+
+        static void processPartyInvited(Net::MessageIn &msg);
 };
 
 }  // namespace TmwAthena
-- 
cgit v1.2.3-60-g2f50