From 9ee38ba70d51a99b6e5c1cc37dcfc6ccc4f1f7de Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 11 Dec 2014 12:28:54 +0300
Subject: Remove "talk" popup menu handler.

---
 src/gui/popups/popupmenu.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'src/gui/popups/popupmenu.cpp')

diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 4e85109ca..0d917d542 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -251,7 +251,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being)
             {
                 // TRANSLATORS: popup menu item
                 // TRANSLATORS: talk with npc
-                mBrowserBox->addRow("talk", _("Talk"));
+                mBrowserBox->addRow("/talk 'NAME'", _("Talk"));
                 if (serverFeatures->haveNpcWhispers())
                 {
                     // TRANSLATORS: popup menu item
@@ -979,14 +979,9 @@ void PopupMenu::handleLink(const std::string &link,
     if (actorManager)
         being = actorManager->findBeing(mBeingId);
 
-    // Talk To action
-    if (link == "talk" && being && being->canTalk())
-    {
-        being->talkTo();
-    }
     // Trade action
-    else if (link == "trade" && being &&
-             being->getType() == ActorType::Player)
+    if (link == "trade" && being &&
+        being->getType() == ActorType::Player)
     {
         tradeHandler->request(being);
         tradePartnerName = being->getName();
-- 
cgit v1.2.3-60-g2f50