From 30445ed459b803d8ec5a2a847c8e20feab4d14f2 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 11 Dec 2014 12:34:18 +0300 Subject: Remove "trade" popup menu handler. --- src/gui/popups/popupmenu.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 0d917d542..7202c74e4 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -164,7 +164,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) { // TRANSLATORS: popup menu item // TRANSLATORS: trade with player - mBrowserBox->addRow("trade", _("Trade")); + mBrowserBox->addRow("/trade 'NAME'", _("Trade")); // TRANSLATORS: popup menu item // TRANSLATORS: trade attack player mBrowserBox->addRow("attack", _("Attack")); @@ -792,7 +792,7 @@ void PopupMenu::showChatPopup(const int x, const int y, ChatTab *const tab) // TRANSLATORS: popup menu item // TRANSLATORS: trade with player - mBrowserBox->addRow("trade", _("Trade")); + mBrowserBox->addRow("/trade 'NAME'", _("Trade")); // TRANSLATORS: popup menu item // TRANSLATORS: attack player mBrowserBox->addRow("attack", _("Attack")); @@ -979,16 +979,7 @@ void PopupMenu::handleLink(const std::string &link, if (actorManager) being = actorManager->findBeing(mBeingId); - // Trade action - if (link == "trade" && being && - being->getType() == ActorType::Player) - { - tradeHandler->request(being); - tradePartnerName = being->getName(); - if (tradeWindow) - tradeWindow->clear(); - } - else if (link == "buy" && being && mBeingId != 0) + if (link == "buy" && being && mBeingId != 0) { if (being->getType() == ActorType::Npc) npcHandler->buy(mBeingId); -- cgit v1.2.3-70-g09d2