summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-12 18:45:07 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-12 18:45:07 +0300
commit8982d886b218bdda87824301771de2cca6513870 (patch)
tree02142c5599b0deaadac9497cfa12a2308b3d960f
parentcc06df44833d5e39b32065bb7892e787f6a1f54c (diff)
downloadplus-8982d886b218bdda87824301771de2cca6513870.tar.gz
plus-8982d886b218bdda87824301771de2cca6513870.tar.bz2
plus-8982d886b218bdda87824301771de2cca6513870.tar.xz
plus-8982d886b218bdda87824301771de2cca6513870.zip
Remove "whisper" popup menu handler.
-rw-r--r--src/gui/popups/popupmenu.cpp21
1 files changed, 3 insertions, 18 deletions
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)
{