From b07ac409f1940d3767c8e4ade0990d11d2d38b96 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 12 Dec 2014 18:48:32 +0300
Subject: Remove "npc whisper" popup menu handler.
---
src/gui/popups/popupmenu.cpp | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 82c1807c6..625d6822e 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -257,7 +257,8 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being)
{
// TRANSLATORS: popup menu item
// TRANSLATORS: whisper to npc
- mBrowserBox->addRow("npc whisper", _("Whisper"));
+ mBrowserBox->addRow("/whispertext NPC:'NAME'",
+ _("Whisper"));
}
// TRANSLATORS: popup menu item
// TRANSLATORS: buy from npc
@@ -981,22 +982,7 @@ void PopupMenu::handleLink(const std::string &link,
if (actorManager)
being = actorManager->findBeing(mBeingId);
- if (link == "npc whisper" && !mNick.empty())
- {
- if (chatWindow)
- {
- if (config.getBoolValue("whispertab"))
- {
- chatWindow->localChatInput("/q NPC:" + mNick);
- }
- else
- {
- chatWindow->addInputText(std::string("/w \"NPC:").append(
- mNick).append("\" "));
- }
- }
- }
- else if (link == "move" && !mNick.empty())
+ if (link == "move" && !mNick.empty())
{
if (localPlayer)
{
--
cgit v1.2.3-70-g09d2