diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-12-16 17:08:53 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-12-16 17:08:53 +0300 |
commit | f78dea9a6448a3705fcdb8165483cbac0fe60ec0 (patch) | |
tree | 56885b07f2fdcb7860b037f29044d11099b3aab7 | |
parent | 020b31d969885d24fcb5e52a005894396a608d02 (diff) | |
download | manaplus-f78dea9a6448a3705fcdb8165483cbac0fe60ec0.tar.gz manaplus-f78dea9a6448a3705fcdb8165483cbac0fe60ec0.tar.bz2 manaplus-f78dea9a6448a3705fcdb8165483cbac0fe60ec0.tar.xz manaplus-f78dea9a6448a3705fcdb8165483cbac0fe60ec0.zip |
Move processPartyMove from ea namespace into tmwa.
-rw-r--r-- | src/net/ea/partyhandler.cpp | 31 | ||||
-rw-r--r-- | src/net/ea/partyhandler.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/partyhandler.cpp | 31 | ||||
-rw-r--r-- | src/net/tmwa/partyhandler.h | 2 |
4 files changed, 33 insertions, 33 deletions
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 |