diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-01-17 23:38:04 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-01-17 23:38:04 +0300 |
commit | 8701ef562248fb480b83b5b94fe6a970dc112e3d (patch) | |
tree | eb8f951dcb6c728bfc64caca852793cfd9701c18 /src/net/eathena | |
parent | aaec42df1ea3fbc8ef8cac43c8d0661c633a61c6 (diff) | |
download | manaplus-8701ef562248fb480b83b5b94fe6a970dc112e3d.tar.gz manaplus-8701ef562248fb480b83b5b94fe6a970dc112e3d.tar.bz2 manaplus-8701ef562248fb480b83b5b94fe6a970dc112e3d.tar.xz manaplus-8701ef562248fb480b83b5b94fe6a970dc112e3d.zip |
Remove support for hercules plugin version 6.
Diffstat (limited to 'src/net/eathena')
-rw-r--r-- | src/net/eathena/beingrecv.cpp | 2 | ||||
-rw-r--r-- | src/net/eathena/charserverrecv.cpp | 3 | ||||
-rw-r--r-- | src/net/eathena/serverfeatures.cpp | 5 | ||||
-rw-r--r-- | src/net/eathena/serverfeatures.h | 2 |
4 files changed, 2 insertions, 10 deletions
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp index f3c581fff..a736c8884 100644 --- a/src/net/eathena/beingrecv.cpp +++ b/src/net/eathena/beingrecv.cpp @@ -97,8 +97,6 @@ void BeingRecv::processBeingChangeLookCards(Net::MessageIn &msg) if (!actorManager) { // here can be look from char server - if (!serverFeatures->haveAdvancedSprites()) - return; Net::Characters &chars = Net::CharServerHandler::mCharacters; const BeingId id = msg.readBeingId("being id"); diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp index 5d7b9e9d4..0c551a0bc 100644 --- a/src/net/eathena/charserverrecv.cpp +++ b/src/net/eathena/charserverrecv.cpp @@ -57,6 +57,7 @@ extern Net::CharServerHandler *charServerHandler; extern int packetVersion; +extern int serverVersion; namespace EAthena { @@ -179,7 +180,7 @@ void CharServerRecv::readPlayerData(Net::MessageIn &msg, int shoes = 0; if (packetVersion >= 20110111) shoes = msg.readInt32("robe"); - if (!serverFeatures->haveAdvancedSprites()) + if (serverVersion == 0) { tempPlayer->setSpriteId(SPRITE_HAIR, shoes); diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp index 9ab9c1843..8007b31a0 100644 --- a/src/net/eathena/serverfeatures.cpp +++ b/src/net/eathena/serverfeatures.cpp @@ -235,11 +235,6 @@ bool ServerFeatures::haveTeamId() const return false; } -bool ServerFeatures::haveAdvancedSprites() const -{ - return serverVersion >= 7; -} - bool ServerFeatures::haveExtendedRiding() const { return serverVersion >= 9; diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h index 50ae92d34..a9d748691 100644 --- a/src/net/eathena/serverfeatures.h +++ b/src/net/eathena/serverfeatures.h @@ -114,8 +114,6 @@ class ServerFeatures final : public Net::ServerFeatures bool haveTeamId() const override final A_CONST; - bool haveAdvancedSprites() const override final; - bool haveExtendedRiding() const override final; bool haveAdvancedBuySell() const override final A_CONST; |