From 8982d886b218bdda87824301771de2cca6513870 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 12 Dec 2014 18:45:07 +0300 Subject: Remove "whisper" popup menu handler. --- src/gui/popups/popupmenu.cpp | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'src/gui/popups') diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 92229bf75..82c1807c6 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -170,7 +170,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) mBrowserBox->addRow("/attack 'NAME'", _("Attack")); // TRANSLATORS: popup menu item // TRANSLATORS: send whisper to player - mBrowserBox->addRow("whisper", _("Whisper")); + mBrowserBox->addRow("/whispertext 'NAME'", _("Whisper")); addGmCommands(); mBrowserBox->addRow("##3---"); @@ -460,7 +460,7 @@ void PopupMenu::showPlayerPopup(const std::string &nick) // TRANSLATORS: popup menu item // TRANSLATORS: send whisper to player - mBrowserBox->addRow("whisper", _("Whisper")); + mBrowserBox->addRow("/whispertext 'NAME'", _("Whisper")); addGmCommands(); mBrowserBox->addRow("##3---"); @@ -981,22 +981,7 @@ void PopupMenu::handleLink(const std::string &link, if (actorManager) being = actorManager->findBeing(mBeingId); - if (link == "whisper" && !mNick.empty()) - { - if (chatWindow) - { - if (config.getBoolValue("whispertab")) - { - chatWindow->localChatInput("/q " + mNick); - } - else - { - chatWindow->addInputText(std::string("/w \"").append( - mNick).append("\" ")); - } - } - } - else if (link == "npc whisper" && !mNick.empty()) + if (link == "npc whisper" && !mNick.empty()) { if (chatWindow) { -- cgit v1.2.3-70-g09d2