diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-12-11 12:28:54 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-12-11 12:28:54 +0300 |
| commit | 9ee38ba70d51a99b6e5c1cc37dcfc6ccc4f1f7de (patch) | |
| tree | fbdd620c9f2ceebc95c53647b1f64158d93a9fad /src/gui/popups/popupmenu.cpp | |
| parent | ce441bd5539a4562da90ed5ffe80c3bb1eb4d3aa (diff) | |
| download | manaplus-9ee38ba70d51a99b6e5c1cc37dcfc6ccc4f1f7de.tar.gz manaplus-9ee38ba70d51a99b6e5c1cc37dcfc6ccc4f1f7de.tar.bz2 manaplus-9ee38ba70d51a99b6e5c1cc37dcfc6ccc4f1f7de.tar.xz manaplus-9ee38ba70d51a99b6e5c1cc37dcfc6ccc4f1f7de.zip | |
Remove "talk" popup menu handler.
Diffstat (limited to 'src/gui/popups/popupmenu.cpp')
| -rw-r--r-- | src/gui/popups/popupmenu.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
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(); |