From d9be3eb4cf0ebbe29ef93759a3d168ebe9e592c1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 1 May 2017 20:11:13 +0300 Subject: Remove ServerFeatures haveVending because it depend only on server type. --- src/gui/popups/popupmenu.cpp | 3 ++- src/gui/windows/shopwindow.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/gui') diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index b1110c615..2082cbebf 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -2705,7 +2705,8 @@ void PopupMenu::addBuySell(const Being *const being) if (player_relations.getDefault() & PlayerRelation::TRADE) { mBrowserBox->addRow("##3---"); - const bool haveVending = serverFeatures->haveVending(); + const bool haveVending = + (Net::getNetworkType() == ServerType::EATHENA); if (being->isSellShopEnabled()) { // TRANSLATORS: popup menu item diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 0de38a084..28260ce92 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -70,6 +70,7 @@ #endif // TMWA_SUPPORT #include "net/buyingstorehandler.h" #include "net/vendinghandler.h" +#include "net/net.h" #include "net/serverfeatures.h" #ifdef TMWA_SUPPORT #include "net/tradehandler.h" @@ -140,7 +141,7 @@ ShopWindow::ShopWindow() : mSellShopSize(0), mBuyShopSize(0), isBuySelected(true), - mHaveVending(serverFeatures->haveVending()), + mHaveVending(Net::getNetworkType() == ServerType::EATHENA), mEnableBuyingStore(false), mEnableVending(false) { -- cgit v1.2.3-70-g09d2