From 77a52b24c88dd113a74ff55cecb63a7214193fdf Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 15 Feb 2015 15:08:47 +0300
Subject: Show buy or sell in player context menu based on enabled shop types.

---
 src/gui/popups/popupmenu.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/gui/popups')

diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 188c8ae9a..d596f1a50 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -2366,20 +2366,27 @@ void PopupMenu::addBuySell(const Being *const being)
     if (player_relations.getDefault() & PlayerRelation::TRADE)
     {
         mBrowserBox->addRow("##3---");
-        if (being->isShopEnabled())
+        const bool haveVending = serverFeatures->haveVending();
+        if (being->isSellShopEnabled())
         {
             // TRANSLATORS: popup menu item
             // TRANSLATORS: buy item
             mBrowserBox->addRow("/buy 'NAME'", _("Buy"));
-            // TRANSLATORS: popup menu item
-            // TRANSLATORS: sell item
-            mBrowserBox->addRow("/sell 'NAME'", _("Sell"));
         }
-        else
+        else if (!haveVending)
         {
             // TRANSLATORS: popup menu item
             // TRANSLATORS: buy item
             mBrowserBox->addRow("/buy 'NAME'", _("Buy (?)"));
+        }
+        if (being->isBuyShopEnabled())
+        {
+            // TRANSLATORS: popup menu item
+            // TRANSLATORS: sell item
+            mBrowserBox->addRow("/sell 'NAME'", _("Sell"));
+        }
+        else if (!haveVending)
+        {
             // TRANSLATORS: popup menu item
             // TRANSLATORS: sell item
             mBrowserBox->addRow("/sell 'NAME'", _("Sell (?)"));
-- 
cgit v1.2.3-70-g09d2