summaryrefslogtreecommitdiff
path: root/src/gui/popups
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-14 13:44:19 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-14 13:44:19 +0300
commitf567410dc7cdcf888dc4a5fa6e3e50cb8d659e80 (patch)
tree53d3658048c4ea48161af163d38f3d729abffe8b /src/gui/popups
parent8b9829b4fd8956023da96dd8435e255ed4c9be76 (diff)
downloadmanaplus-f567410dc7cdcf888dc4a5fa6e3e50cb8d659e80.tar.gz
manaplus-f567410dc7cdcf888dc4a5fa6e3e50cb8d659e80.tar.bz2
manaplus-f567410dc7cdcf888dc4a5fa6e3e50cb8d659e80.tar.xz
manaplus-f567410dc7cdcf888dc4a5fa6e3e50cb8d659e80.zip
Remove "name" popup menu handler.
Diffstat (limited to 'src/gui/popups')
-rw-r--r--src/gui/popups/popupmenu.cpp16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 4d2b5a7dd..56da65cc6 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -368,7 +368,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being)
}
// TRANSLATORS: popup menu item
// TRANSLATORS: add being name to chat
- mBrowserBox->addRow("name", _("Add name to chat"));
+ mBrowserBox->addRow("/addtext 'NAME'", _("Add name to chat"));
mBrowserBox->addRow("##3---");
// TRANSLATORS: popup menu item
@@ -532,7 +532,7 @@ void PopupMenu::showPlayerPopup(const std::string &nick)
addBuySellDefault();
// TRANSLATORS: popup menu item
// TRANSLATORS: add player name to chat
- mBrowserBox->addRow("name", _("Add name to chat"));
+ mBrowserBox->addRow("/addtext 'NAME'", _("Add name to chat"));
mBrowserBox->addRow("##3---");
// TRANSLATORS: popup menu item
// TRANSLATORS: close menu
@@ -982,15 +982,9 @@ void PopupMenu::handleLink(const std::string &link,
if (actorManager)
being = actorManager->findBeing(mBeingId);
- if (link == "name" && !mNick.empty())
- {
- const std::string &name = mNick;
- if (chatWindow)
- chatWindow->addInputText(name);
- }
- else if (link == "admin-kick" && being &&
- (being->getType() == ActorType::Player ||
- being->getType() == ActorType::Monster))
+ if (link == "admin-kick" && being &&
+ (being->getType() == ActorType::Player ||
+ being->getType() == ActorType::Monster))
{
adminHandler->kick(being->getId());
}