From 89bc2ec72aa3713fc5a02ec1fcc4ea826043e9c3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 1 May 2017 18:28:32 +0300 Subject: Remove ServerFeatures haveEightDirections because it depend only on server type. --- src/resources/db/itemdb.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/resources') diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index 94c9b14b8..e0616090d 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -39,6 +39,7 @@ #include "resources/sprite/spritereference.h" +#include "net/net.h" #include "net/serverfeatures.h" #include "utils/checkutils.h" @@ -780,10 +781,12 @@ static int parseDirectionName(const std::string &name) int id = -1; if (name == "down") { - if (serverFeatures->haveEightDirections()) - id = SpriteDirection::DOWN; - else +#ifdef TMWA_SUPPORT + if (Net::getNetworkType() == ServerType::TMWATHENA) id = -2; + else +#endif + id = SpriteDirection::DOWN; } else if (name == "downleft" || name == "leftdown") { @@ -799,10 +802,12 @@ static int parseDirectionName(const std::string &name) } else if (name == "up") { - if (serverFeatures->haveEightDirections()) - id = SpriteDirection::UP; - else +#ifdef TMWA_SUPPORT + if (Net::getNetworkType() == ServerType::TMWATHENA) id = -3; + else +#endif + id = SpriteDirection::UP; } else if (name == "upright" || name == "rightup") { -- cgit v1.2.3-70-g09d2