diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-01-05 21:08:58 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-01-05 21:08:58 +0300 |
commit | cc79a815a38dab8970e28a692b9a051627c8e56a (patch) | |
tree | f8bf44c5dcfe3e554555c827594570bbf8309312 /src/net/eathena/beingrecv.cpp | |
parent | c4274b8b5798ffaee2a783f7a1f10e6f80c93f9e (diff) | |
download | manaplus-cc79a815a38dab8970e28a692b9a051627c8e56a.tar.gz manaplus-cc79a815a38dab8970e28a692b9a051627c8e56a.tar.bz2 manaplus-cc79a815a38dab8970e28a692b9a051627c8e56a.tar.xz manaplus-cc79a815a38dab8970e28a692b9a051627c8e56a.zip |
Change packet version to 11. Impliment fixed packets for same version.
Diffstat (limited to 'src/net/eathena/beingrecv.cpp')
-rw-r--r-- | src/net/eathena/beingrecv.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
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<AttackTypeT>( msg.readUInt8("action")); |