summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-20 00:23:36 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-20 00:23:36 +0300
commit59bc8a615eb7939474190539fe7848da0132e8f8 (patch)
tree39803cedb101289c7c23785889c4bff6330ef5fd
parent39bac12e561d6cfd9ee8707069ec07ecee4efe00 (diff)
downloadmv-59bc8a615eb7939474190539fe7848da0132e8f8.tar.gz
mv-59bc8a615eb7939474190539fe7848da0132e8f8.tar.bz2
mv-59bc8a615eb7939474190539fe7848da0132e8f8.tar.xz
mv-59bc8a615eb7939474190539fe7848da0132e8f8.zip
Split processPartySettingsContinue.
-rw-r--r--src/net/ea/partyrecv.cpp9
-rw-r--r--src/net/ea/partyrecv.h7
-rw-r--r--src/net/eathena/partyrecv.cpp3
-rw-r--r--src/net/tmwa/partyrecv.cpp3
4 files changed, 14 insertions, 8 deletions
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<PartyShareT>(
msg.readInt32("party exp"));
+ Ea::PartyRecv::processPartyExpSettingsContinue(msg, exp);
if (msg.getVersion() >= 20090603)
{
const PartyShareT item = static_cast<PartyShareT>(
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<PartyShareT>(
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)