From f78dea9a6448a3705fcdb8165483cbac0fe60ec0 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 16 Dec 2014 17:08:53 +0300
Subject: Move processPartyMove from ea namespace into tmwa.

---
 src/net/ea/partyhandler.cpp   | 31 -------------------------------
 src/net/ea/partyhandler.h     |  2 --
 src/net/tmwa/partyhandler.cpp | 31 +++++++++++++++++++++++++++++++
 src/net/tmwa/partyhandler.h   |  2 ++
 4 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'src')

diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 76b08f6bb..d16578840 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -137,37 +137,6 @@ void PartyHandler::processPartySettingsContinue(const int16_t exp,
     }
 }
 
-void PartyHandler::processPartyMove(Net::MessageIn &msg)
-{
-    const int id = msg.readInt32("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(), 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::processPartyLeave(Net::MessageIn &msg)
 {
     const int id = msg.readInt32("account id");
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index 7dc0e6664..ffc57adf2 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 processPartyMove(Net::MessageIn &msg);
-
         static void processPartyLeave(Net::MessageIn &msg);
 
         static void processPartyUpdateHp(Net::MessageIn &msg);
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index fac29f8f3..3e16fc08a 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -404,4 +404,35 @@ void PartyHandler::processPartyInvited(Net::MessageIn &msg)
         socialWindow->showPartyInvite(partyName, nick, 0);
 }
 
+void PartyHandler::processPartyMove(Net::MessageIn &msg)
+{
+    const int id = msg.readInt32("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(), 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");
+    }
+}
+
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index 4baeada71..34d64aeb5 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -76,6 +76,8 @@ class PartyHandler final : public MessageHandler, public Ea::PartyHandler
         static void processPartyInviteResponse(Net::MessageIn &msg);
 
         static void processPartyInvited(Net::MessageIn &msg);
+
+        static void processPartyMove(Net::MessageIn &msg);
 };
 
 }  // namespace TmwAthena
-- 
cgit v1.2.3-70-g09d2