From 87918db755040bb693cb286d8fb0bcfd97d761af Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 1 May 2017 17:52:56 +0300 Subject: Remove ServerFeatures haveItemColors because it depend only by server type. --- src/resources/item/shopitem.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/resources/item/shopitem.cpp') diff --git a/src/resources/item/shopitem.cpp b/src/resources/item/shopitem.cpp index 27a496814..55926c46d 100644 --- a/src/resources/item/shopitem.cpp +++ b/src/resources/item/shopitem.cpp @@ -26,6 +26,7 @@ #include "utils/stringutils.h" +#include "net/net.h" #include "net/serverfeatures.h" #include "resources/db/unitsdb.h" @@ -96,10 +97,12 @@ ShopItem::~ShopItem() void ShopItem::updateDisplayName(const int quantity) { - if (serverFeatures->haveItemColors()) - mDisplayName = std::string(getInfo().getName(mColor)); - else +#ifdef TMWA_SUPPORT + if (Net::getNetworkType() == ServerType::TMWATHENA) mDisplayName = std::string(getInfo().getName()); + else +#endif // TMWA_SUPPORT + mDisplayName = std::string(getInfo().getName(mColor)); if (mPrice) { mDisplayName.append(" (").append( -- cgit v1.2.3-60-g2f50