add server feature haveItemColors.

2 files changed, 7 insertions, 4 deletions

diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 797520c7b..42eeed6be 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -41,6 +41,9 @@
 #include "resources/iteminfo.h"
 #include "resources/resourcemanager.h"
 
+#include "net/net.h"
+#include "net/serverfeatures.h"
+
 #include "debug.h"
 
 extern int serverVersion;
@@ -117,7 +120,7 @@ void ItemPopup::setItem(const Item *const item, const bool showImage)
         mLastName = ii.getName();
         mLastColor = item->getColor();
         mLastId = item->getId();
-        if (serverVersion > 0)
+        if (Net::getServerFeatures()->haveItemColors())
         {
             mItemName->setCaption(strprintf("%s (+%u), %d",
                 ii.getName(item->getColor()).c_str(),
@@ -181,7 +184,7 @@ void ItemPopup::setItem(const ItemInfo &item, const unsigned char color,
     mLastColor = color;
     mLastId = id;
 
-    if (serverVersion > 0)
+    if (Net::getServerFeatures()->haveItemColors())
     {
         mItemName->setCaption(strprintf("%s, %d",
             item.getName(color).c_str(), id));
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index bcc0b92ef..b92d572fb 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -1089,7 +1089,7 @@ void PopupMenu::handleLink(const std::string &link,
         {
             if (mItem)
             {
-                if (serverVersion > 0)
+                if (Net::getServerFeatures()->haveItemColors())
                 {
                     chatWindow->addItemText(mItem->getInfo().getName(
                         mItem->getColor()));
@@ -1106,7 +1106,7 @@ void PopupMenu::handleLink(const std::string &link,
 
                 if (item)
                 {
-                    if (serverVersion > 0)
+                    if (Net::getServerFeatures()->haveItemColors())
                     {
                         chatWindow->addItemText(item->getInfo().getName(
                             item->getColor()));