diff options
-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 | ||||
-rw-r--r-- | src/net/serverfeatures.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/serverfeatures.cpp | 5 | ||||
-rw-r--r-- | src/net/tmwa/serverfeatures.h | 2 |
7 files changed, 2 insertions, 19 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; diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h index 4f9165fd2..1e73add7c 100644 --- a/src/net/serverfeatures.h +++ b/src/net/serverfeatures.h @@ -116,8 +116,6 @@ class ServerFeatures notfinal virtual bool haveTeamId() const = 0; - virtual bool haveAdvancedSprites() const = 0; - virtual bool haveExtendedRiding() const = 0; virtual bool haveAdvancedBuySell() const = 0; diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp index dbd8bdb07..359c60546 100644 --- a/src/net/tmwa/serverfeatures.cpp +++ b/src/net/tmwa/serverfeatures.cpp @@ -233,11 +233,6 @@ bool ServerFeatures::haveTeamId() const return true; } -bool ServerFeatures::haveAdvancedSprites() const -{ - return false; -} - bool ServerFeatures::haveExtendedRiding() const { return false; diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h index f4dea712d..f05d04ae3 100644 --- a/src/net/tmwa/serverfeatures.h +++ b/src/net/tmwa/serverfeatures.h @@ -114,8 +114,6 @@ class ServerFeatures final : public Net::ServerFeatures bool haveTeamId() const override final; - bool haveAdvancedSprites() const override final A_CONST; - bool haveExtendedRiding() const override final A_CONST; bool haveAdvancedBuySell() const override final A_CONST; |