From 87918db755040bb693cb286d8fb0bcfd97d761af Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 1 May 2017 17:52:56 +0300
Subject: Remove ServerFeatures haveItemColors because it depend only by server
 type.

---
 src/being/flooritem.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/being/flooritem.cpp')

diff --git a/src/being/flooritem.cpp b/src/being/flooritem.cpp
index 04be493f0..bc60c5e2a 100644
--- a/src/being/flooritem.cpp
+++ b/src/being/flooritem.cpp
@@ -37,6 +37,7 @@
 
 #include "resources/map/map.h"
 
+#include "net/net.h"
 #include "net/serverfeatures.h"
 
 #include "debug.h"
@@ -142,10 +143,16 @@ const ItemInfo &FloorItem::getInfo() const
 std::string FloorItem::getName() const
 {
     const ItemInfo &info = ItemDB::get(mItemId);
-    if (serverFeatures->haveItemColors())
-        return info.getName(mColor);
-    else
+#ifdef TMWA_SUPPORT
+    if (Net::getNetworkType() == ServerType::TMWATHENA)
+    {
         return info.getName();
+    }
+    else
+#endif  // TMWA_SUPPORT
+    {
+        return info.getName(mColor);
+    }
 }
 
 void FloorItem::draw(Graphics *const graphics,
-- 
cgit v1.2.3-60-g2f50