From 59bc8a615eb7939474190539fe7848da0132e8f8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 20 Aug 2016 00:23:36 +0300 Subject: Split processPartySettingsContinue. --- src/net/ea/partyrecv.cpp | 9 ++++++--- src/net/ea/partyrecv.h | 7 ++++--- src/net/eathena/partyrecv.cpp | 3 ++- src/net/tmwa/partyrecv.cpp | 3 ++- 4 files changed, 14 insertions(+), 8 deletions(-) (limited to 'src/net') diff --git a/src/net/ea/partyrecv.cpp b/src/net/ea/partyrecv.cpp index 6d7146ab5..2efab0286 100644 --- a/src/net/ea/partyrecv.cpp +++ b/src/net/ea/partyrecv.cpp @@ -60,9 +60,8 @@ void PartyRecv::processPartyCreate(Net::MessageIn &msg) NotifyManager::notify(NotifyTypes::PARTY_CREATED); } -void PartyRecv::processPartySettingsContinue(Net::MessageIn &msg, - const PartyShareT exp, - const PartyShareT item) +void PartyRecv::processPartyExpSettingsContinue(Net::MessageIn &msg, + const PartyShareT exp) { switch (exp) { @@ -89,7 +88,11 @@ void PartyRecv::processPartySettingsContinue(Net::MessageIn &msg, UNIMPLIMENTEDPACKETFIELD(CAST_S32(exp)); break; } +} +void PartyRecv::processPartyItemSettingsContinue(Net::MessageIn &msg, + const PartyShareT item) +{ switch (item) { case PartyShare::YES: diff --git a/src/net/ea/partyrecv.h b/src/net/ea/partyrecv.h index c65388716..6c142fd8a 100644 --- a/src/net/ea/partyrecv.h +++ b/src/net/ea/partyrecv.h @@ -41,9 +41,10 @@ namespace Ea void processPartyCreate(Net::MessageIn &msg); void processPartyLeave(Net::MessageIn &msg); void processPartyUpdateCoords(Net::MessageIn &msg); - void processPartySettingsContinue(Net::MessageIn &msg, - const PartyShareT exp, - const PartyShareT item); + void processPartyExpSettingsContinue(Net::MessageIn &msg, + const PartyShareT exp); + void processPartyItemSettingsContinue(Net::MessageIn &msg, + const PartyShareT item); void createTab(); } // namespace PartyRecv diff --git a/src/net/eathena/partyrecv.cpp b/src/net/eathena/partyrecv.cpp index 34239a624..f0789cbf2 100644 --- a/src/net/eathena/partyrecv.cpp +++ b/src/net/eathena/partyrecv.cpp @@ -89,12 +89,13 @@ void PartyRecv::processPartySettings(Net::MessageIn &msg) const PartyShareT exp = static_cast( msg.readInt32("party exp")); + Ea::PartyRecv::processPartyExpSettingsContinue(msg, exp); if (msg.getVersion() >= 20090603) { const PartyShareT item = static_cast( msg.readInt8("pickup item share (&1)")); msg.readInt8("get item share (&2)"); - Ea::PartyRecv::processPartySettingsContinue(msg, exp, item); + Ea::PartyRecv::processPartyItemSettingsContinue(msg, item); } } diff --git a/src/net/tmwa/partyrecv.cpp b/src/net/tmwa/partyrecv.cpp index 885052587..96b3104a2 100644 --- a/src/net/tmwa/partyrecv.cpp +++ b/src/net/tmwa/partyrecv.cpp @@ -58,7 +58,8 @@ void PartyRecv::processPartySettings(Net::MessageIn &msg) msg.readInt16("share exp")); const PartyShareT item = static_cast( msg.readInt16("share items")); - Ea::PartyRecv::processPartySettingsContinue(msg, exp, item); + Ea::PartyRecv::processPartyExpSettingsContinue(msg, exp); + Ea::PartyRecv::processPartyItemSettingsContinue(msg, item); } void PartyRecv::processPartyInfo(Net::MessageIn &msg) -- cgit v1.2.3-70-g09d2