diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-05-01 20:11:13 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-05-01 20:11:13 +0300 |
| commit | d9be3eb4cf0ebbe29ef93759a3d168ebe9e592c1 (patch) | |
| tree | cf04cf0aeaaa854eacf8718d80c2ad863c24ebb5 /src/gui | |
| parent | f06f491e3f9a5c47b98ec136c8eee7789152ce32 (diff) | |
| download | plus-d9be3eb4cf0ebbe29ef93759a3d168ebe9e592c1.tar.gz plus-d9be3eb4cf0ebbe29ef93759a3d168ebe9e592c1.tar.bz2 plus-d9be3eb4cf0ebbe29ef93759a3d168ebe9e592c1.tar.xz plus-d9be3eb4cf0ebbe29ef93759a3d168ebe9e592c1.zip | |
Remove ServerFeatures haveVending because it depend only on server type.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/popups/popupmenu.cpp | 3 | ||||
| -rw-r--r-- | src/gui/windows/shopwindow.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
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) { |