From cc79a815a38dab8970e28a692b9a051627c8e56a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 5 Jan 2016 21:08:58 +0300 Subject: Change packet version to 11. Impliment fixed packets for same version. --- src/net/eathena/beingrecv.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/net/eathena/beingrecv.cpp') diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp index 7a3c09697..639ce37ab 100644 --- a/src/net/eathena/beingrecv.cpp +++ b/src/net/eathena/beingrecv.cpp @@ -65,6 +65,8 @@ #include "debug.h" +extern int serverVersion; + namespace EAthena { @@ -253,6 +255,8 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg) // Information about a being in range const BeingId id = msg.readBeingId("being id"); + if (serverVersion == 0 || serverVersion >= 11) + msg.readBeingId("char id"); BeingId spawnId; if (id == Ea::BeingRecv::mSpawnId) spawnId = Ea::BeingRecv::mSpawnId; @@ -413,6 +417,8 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg) // Information about a being in range const BeingId id = msg.readBeingId("being id"); + if (serverVersion == 0 || serverVersion >= 11) + msg.readBeingId("char id"); BeingId spawnId; if (id == Ea::BeingRecv::mSpawnId) spawnId = Ea::BeingRecv::mSpawnId; @@ -587,6 +593,8 @@ void BeingRecv::processBeingSpawn(Net::MessageIn &msg) // Information about a being in range const BeingId id = msg.readBeingId("being id"); + if (serverVersion == 0 || serverVersion >= 11) + msg.readBeingId("char id"); Ea::BeingRecv::mSpawnId = id; const BeingId spawnId = id; int16_t speed = msg.readInt16("speed"); @@ -910,6 +918,8 @@ void BeingRecv::processBeingAction2(Net::MessageIn &msg) const int srcSpeed = msg.readInt32("src speed"); msg.readInt32("dst speed"); const int param1 = msg.readInt32("damage"); + if (serverVersion == 0 || serverVersion >= 11) + msg.readUInt8("is sp damaged"); msg.readInt16("count"); const AttackTypeT type = static_cast( msg.readUInt8("action")); -- cgit v1.2.3-70-g09d2