From 616ab2676cc932ab59152c510d584c429090987a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 17 Sep 2014 11:50:28 +0300 Subject: Remove getter for serverFeatures. --- src/gui/popups/itempopup.cpp | 4 ++-- src/gui/popups/popupmenu.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gui/popups') diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp index fb4c3a9fd..cf471ba3e 100644 --- a/src/gui/popups/itempopup.cpp +++ b/src/gui/popups/itempopup.cpp @@ -118,7 +118,7 @@ void ItemPopup::setItem(const Item *const item, const bool showImage) mLastName = ii.getName(); mLastColor = item->getColor(); mLastId = item->getId(); - if (Net::getServerFeatures()->haveItemColors()) + if (serverFeatures->haveItemColors()) { mItemName->setCaption(strprintf("%s (+%u), %d", ii.getName(item->getColor()).c_str(), @@ -182,7 +182,7 @@ void ItemPopup::setItem(const ItemInfo &item, const unsigned char color, mLastColor = color; mLastId = id; - if (Net::getServerFeatures()->haveItemColors()) + if (serverFeatures->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 9aa99b229..31ae42b4a 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -793,7 +793,7 @@ void PopupMenu::showChatPopup(const int x, const int y, ChatTab *const tab) } addPlayerMisc(); addBuySellDefault(); - if (Net::getServerFeatures()->havePartyNickInvite()) + if (serverFeatures->havePartyNickInvite()) addParty(wTab->getNick()); mBrowserBox->addRow("##3---"); } @@ -1087,7 +1087,7 @@ void PopupMenu::handleLink(const std::string &link, { if (mItem) { - if (Net::getServerFeatures()->haveItemColors()) + if (serverFeatures->haveItemColors()) { chatWindow->addItemText(mItem->getInfo().getName( mItem->getColor())); @@ -1104,7 +1104,7 @@ void PopupMenu::handleLink(const std::string &link, if (item) { - if (Net::getServerFeatures()->haveItemColors()) + if (serverFeatures->haveItemColors()) { chatWindow->addItemText(item->getInfo().getName( item->getColor())); -- cgit v1.2.3-70-g09d2