summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/net/eathena/beingrecv.cpp64
-rw-r--r--src/net/eathena/packetsin.inc7
2 files changed, 53 insertions, 18 deletions
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index ef6ebf3d6..86786f1fa 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -453,14 +453,27 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
if (!actorManager)
return;
- msg.readInt16("len");
- const BeingType::BeingType type = static_cast<BeingType::BeingType>(
- msg.readUInt8("object type"));
+ if (msg.getVersion() >= 20091103)
+ msg.readInt16("len");
+ BeingType::BeingType type;
+ if (msg.getVersion() >= 20071106)
+ {
+ type = static_cast<BeingType::BeingType>(
+ msg.readUInt8("object type"));
+ }
+ else
+ {
+ // need detect type based on id
+ type = BeingType::MONSTER;
+ }
// Information about a being in range
const BeingId id = msg.readBeingId("being id");
- if (serverVersion == 0 || serverVersion >= 11)
+ if (msg.getVersion() >= 20131223 &&
+ (serverVersion == 0 || serverVersion >= 11))
+ {
msg.readBeingId("char id");
+ }
BeingId spawnId;
if (id == Ea::BeingRecv::mSpawnId)
spawnId = Ea::BeingRecv::mSpawnId;
@@ -471,7 +484,11 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
const uint32_t opt1 = msg.readInt16("opt1");
// probably wrong effect usage
const uint32_t opt2 = msg.readInt16("opt2");
- const uint32_t option = msg.readInt32("option");
+ uint32_t option;
+ if (msg.getVersion() >= 7)
+ option = msg.readInt32("option");
+ else
+ option = msg.readInt16("option");
const int16_t job = msg.readInt16("class");
Being *dstBeing = actorManager->findBeing(id);
@@ -516,11 +533,15 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
localPlayer->checkNewName(dstBeing);
const int hairStyle = msg.readInt16("hair style");
- const uint32_t weapon = CAST_U32(msg.readInt32("weapon"));
+ uint32_t weapon;
+ if (msg.getVersion() >= 7)
+ weapon = CAST_U32(msg.readInt32("weapon"));
+ else
+ weapon = CAST_U32(msg.readInt16("weapon"));
const uint16_t headBottom = msg.readInt16("head bottom");
-
msg.readInt32("tick");
-
+ if (msg.getVersion() < 7)
+ msg.readInt16("shield");
const uint16_t headTop = msg.readInt16("head top");
const uint16_t headMid = msg.readInt16("head mid");
const ItemColor hairColor = fromInt(
@@ -529,11 +550,16 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
const uint16_t gloves = msg.readInt16("head dir / gloves");
// may be use robe as gloves?
- msg.readInt16("robe");
+ if (msg.getVersion() >= 20101124)
+ msg.readInt16("robe");
msg.readInt32("guild id");
msg.readInt16("guild emblem");
dstBeing->setManner(msg.readInt16("manner"));
- const uint32_t opt3 = msg.readInt32("opt3");
+ uint32_t opt3;
+ if (msg.getVersion() >= 7)
+ opt3 = msg.readInt32("opt3");
+ else
+ opt3 = msg.readInt16("opt3");
dstBeing->setKarma(msg.readUInt8("karma"));
const uint8_t gender = CAST_U8(msg.readUInt8("gender") & 3);
@@ -598,14 +624,16 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
const int level = CAST_S32(msg.readInt16("level"));
if (level)
dstBeing->setLevel(level);
- msg.readInt16("font");
-
- const int maxHP = msg.readInt32("max hp");
- const int hp = msg.readInt32("hp");
- dstBeing->setMaxHP(maxHP);
- dstBeing->setHP(hp);
-
- msg.readInt8("is boss");
+ if (msg.getVersion() >= 20080102)
+ msg.readInt16("font");
+ if (msg.getVersion() >= 20120221)
+ {
+ const int maxHP = msg.readInt32("max hp");
+ const int hp = msg.readInt32("hp");
+ dstBeing->setMaxHP(maxHP);
+ dstBeing->setHP(hp);
+ msg.readInt8("is boss");
+ }
if (msg.getVersion() >= 20150513)
{
msg.readInt16("body2");
diff --git a/src/net/eathena/packetsin.inc b/src/net/eathena/packetsin.inc
index 1febbe6da..b13cfdc8f 100644
--- a/src/net/eathena/packetsin.inc
+++ b/src/net/eathena/packetsin.inc
@@ -43,6 +43,7 @@ packet(SMSG_SKILL_CASTING, 0x013e, 24, &BeingRecv::processSkill
packet(SMSG_BEING_STATUS_CHANGE, 0x0196, 9, &BeingRecv::processBeingStatusChange, 1);
packet(SMSG_QUEST_LIST, 0x02b1, -1, &QuestRecv::processAddQuests, 1);
packet(SMSG_BEING_VIEW_EQUIPMENT, 0x02d7, -1, &BeingRecv::processBeingViewEquipment, 1);
+packet(SMSG_BEING_MOVE, 0x007b, 60, &BeingRecv::processBeingMove, 1);
// login server, unknown version
packet(SMSG_LOGIN_DATA, 0x0069, -1, &Ea::LoginRecv::processLoginData, 0);
@@ -282,6 +283,7 @@ if (packetVersion >= 4)
packet(SMSG_BEING_CHANGE_LOOKS2, 0x01d7, 11, &BeingRecv::processBeingChangeLook2, 4);
packet(SMSG_BEING_VISIBLE, 0x01d8, 54, &BeingRecv::processBeingVisible, 4);
packet(SMSG_BEING_SPAWN, 0x01d9, 53, &BeingRecv::processBeingSpawn, 4);
+ packet(SMSG_BEING_MOVE, 0x01da, 60, &BeingRecv::processBeingMove, 4);
}
// 5
@@ -299,6 +301,7 @@ if (packetVersion >= 7)
{
packet(SMSG_BEING_VISIBLE, 0x022a, 58, &BeingRecv::processBeingVisible, 7);
packet(SMSG_BEING_SPAWN, 0x022b, 57, &BeingRecv::processBeingSpawn, 7);
+ packet(SMSG_BEING_MOVE, 0x022c, 65, &BeingRecv::processBeingMove, 7);
}
// 20040816
@@ -450,6 +453,7 @@ packet(SMSG_INSTANCE_INFO, 0x02cd, 71, &MapRecv::processInstanc
if (packetVersion >= 20071106)
{
packet(SMSG_BEING_FAKE_NAME, 0x0078, 55, &BeingRecv::processBeingFakeName, 20071106);
+ packet(SMSG_BEING_MOVE, 0x022c, 65, &BeingRecv::processBeingMove, 20071106);
packet(SMSG_MERCENARY_INFO, 0x029b, 80, &MercenaryRecv::processMercenaryInfo, 20071106);
}
@@ -466,6 +470,7 @@ if (packetVersion >= 20080102)
packet(SMSG_PLAYER_CART_ITEMS, 0x02e9, -1, &InventoryRecv::processPlayerCartItems, 20080102);
packet(SMSG_PLAYER_STORAGE_ITEMS, 0x02ea, -1, &InventoryRecv::processPlayerStorage, 20080102);
packet(SMSG_MAP_LOGIN_SUCCESS, 0x02eb, 14, &GameRecv::processMapLogin, 20080102);
+ packet(SMSG_BEING_MOVE, 0x02ec, 67, &BeingRecv::processBeingMove, 20080102);
packet(SMSG_BEING_SPAWN, 0x02ed, 59, &BeingRecv::processBeingSpawn, 20080102);
packet(SMSG_BEING_VISIBLE, 0x02ee, 60, &BeingRecv::processBeingVisible, 20080102);
packet(SMSG_BEING_FONT, 0x02ef, 8, &BeingRecv::processBeingFont, 20080102);
@@ -522,6 +527,7 @@ packet(SMSG_PLAYER_GET_EXP, 0x07f6, 14, &PlayerRecv::processPlay
if (packetVersion >= 20091103)
{
+ packet(SMSG_BEING_MOVE, 0x07f7, -1, &BeingRecv::processBeingMove, 20091103);
packet(SMSG_BEING_SPAWN, 0x07f8, -1, &BeingRecv::processBeingSpawn, 20091103);
packet(SMSG_BEING_VISIBLE, 0x07f9, -1, &BeingRecv::processBeingVisible, 20091103);
}
@@ -604,6 +610,7 @@ packet(SMSG_GUILD_EXPULSION, 0x0839, 66, &GuildRecv::processGuild
// 20101124
if (packetVersion >= 20101124)
{
+ packet(SMSG_BEING_MOVE, 0x0856, -1, &BeingRecv::processBeingMove, 20101124);
packet(SMSG_BEING_VISIBLE, 0x0857, -1, &BeingRecv::processBeingVisible, 20101124);
packet(SMSG_BEING_SPAWN, 0x0858, -1, &BeingRecv::processBeingSpawn, 20101124);
packet(SMSG_BEING_VIEW_EQUIPMENT, 0x0859, -1, &BeingRecv::processBeingViewEquipment, 20101124);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-21 09:24:07 +0000