From 1cf6cb343c6c8df8a998c617fd6f8d40f5affbea Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 22 Mar 2016 18:59:41 +0300 Subject: Add support for packet version in servers list xml and in editor. --- src/net/eathena/loginhandler.cpp | 6 ++++++ src/net/eathena/loginhandler.h | 2 ++ src/net/eathena/packetsin.inc | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src/net/eathena') diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp index a7bcd5406..07614be0c 100644 --- a/src/net/eathena/loginhandler.cpp +++ b/src/net/eathena/loginhandler.cpp @@ -29,6 +29,7 @@ #include "net/eathena/messageout.h" #include "net/eathena/network.h" +#include "net/eathena/updateprotocol.h" #include "net/eathena/protocolout.h" #include "debug.h" @@ -141,4 +142,9 @@ void LoginHandler::ping() const outMsg.writeInt32(0, "unused"); } +void LoginHandler::updatePacketVersion() const +{ + updateProtocol(); +} + } // namespace EAthena diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h index 19a8a3f3c..b564b1b27 100644 --- a/src/net/eathena/loginhandler.h +++ b/src/net/eathena/loginhandler.h @@ -56,6 +56,8 @@ class LoginHandler final : public Ea::LoginHandler void ping() const override final; + void updatePacketVersion() const override final; + private: void sendLoginRegister(const std::string &restrict username, const std::string &restrict password, diff --git a/src/net/eathena/packetsin.inc b/src/net/eathena/packetsin.inc index 8ed2e0b2b..510376e9c 100644 --- a/src/net/eathena/packetsin.inc +++ b/src/net/eathena/packetsin.inc @@ -447,7 +447,7 @@ if (serverVersion >= 11 || serverVersion == 0) packet(SMSG_BEING_MOVE, 0x09db, -1, &BeingRecv::processBeingMove); } -if (serverVersion >= 8 && packetVersion >= 20150226) +if ((serverVersion >= 8 || serverVersion == 0) && packetVersion >= 20150226) { packet(SMSG_VENDING_OPEN, 0x0136, -1, &VendingRecv::processOpen); packet(SMSG_VENDING_ITEMS_LIST, 0x0800, -1, &VendingRecv::processItemsList); -- cgit v1.2.3-70-g09d2