summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-09-12 17:54:41 +0300
committerAndrei Karas <akaras@inbox.ru>2016-09-12 17:54:41 +0300
commit86d451e352abe27edca69107bc7cb380f4336aa9 (patch)
treef1ea1fdaad45905b5139c666cfe3ce0cf36a1eea
parent48c215204404187e69b60c912c345429bcd37934 (diff)
downloadmanaverse-86d451e352abe27edca69107bc7cb380f4336aa9.tar.gz
manaverse-86d451e352abe27edca69107bc7cb380f4336aa9.tar.bz2
manaverse-86d451e352abe27edca69107bc7cb380f4336aa9.tar.xz
manaverse-86d451e352abe27edca69107bc7cb380f4336aa9.zip
Add packet SMSG_BATTLE_UPDATE_HP 0x0a0e.
-rw-r--r--src/net/eathena/battlegroundrecv.cpp14
-rw-r--r--src/net/eathena/packetsin.inc6
2 files changed, 17 insertions, 3 deletions
diff --git a/src/net/eathena/battlegroundrecv.cpp b/src/net/eathena/battlegroundrecv.cpp
index ecbeb5ef2..515dc8ad6 100644
--- a/src/net/eathena/battlegroundrecv.cpp
+++ b/src/net/eathena/battlegroundrecv.cpp
@@ -107,9 +107,17 @@ void BattleGroundRecv::processBattleUpdateHp(Net::MessageIn &msg)
{
UNIMPLIMENTEDPACKET;
msg.readBeingId("account id");
- msg.readString(24, "name");
- msg.readInt16("hp");
- msg.readInt16("max hp");
+ if (msg.getVersion() >= 20140613)
+ {
+ msg.readInt32("hp");
+ msg.readInt32("max hp");
+ }
+ else
+ {
+ msg.readString(24, "name");
+ msg.readInt16("hp");
+ msg.readInt16("max hp");
+ }
}
} // namespace EAthena
diff --git a/src/net/eathena/packetsin.inc b/src/net/eathena/packetsin.inc
index 44482a2eb..3c7003831 100644
--- a/src/net/eathena/packetsin.inc
+++ b/src/net/eathena/packetsin.inc
@@ -769,6 +769,12 @@ if (packetVersion >= 20131223)
packet(SMSG_SKILL_NO_DAMAGE, 0x09cb, 17, &Ea::BeingRecv::processSkillNoDamage, 20131223);
}
+// 20140613
+if (packetVersion >= 20140613)
+{
+ packet(SMSG_BATTLE_UPDATE_HP, 0x0a0e, 14, &BattleGroundRecv::processBattleUpdateHp, 20140613);
+}
+
// 20141016
packet(SMSG_ROULETTE_OPEN_ACK, 0x0a1a, 23, &RouletteRecv::processRouletteOpenAck, 20141016);
packet(SMSG_ROULETTE_INFO_ACK_TYPE, 0x0a1c, 344, &RouletteRecv::processRouletteInfoAckType, 20141016);