diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-12-12 00:04:50 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-12-12 00:04:50 +0300 |
| commit | ddb8fd5d139292ff1f862384577c723db34cf467 (patch) | |
| tree | 362e4582197d66bbb4f990ad54fe3b16517c4fc1 /src | |
| parent | cc11fec318db7293ac960e4ea6bc041d83bad253 (diff) | |
| download | mv-ddb8fd5d139292ff1f862384577c723db34cf467.tar.gz mv-ddb8fd5d139292ff1f862384577c723db34cf467.tar.bz2 mv-ddb8fd5d139292ff1f862384577c723db34cf467.tar.xz mv-ddb8fd5d139292ff1f862384577c723db34cf467.zip | |
Remove "guild" popup menu handler.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/popups/popupmenu.cpp | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index c0fd3ee67..ea0d9f617 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -229,7 +229,8 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) { // TRANSLATORS: popup menu item // TRANSLATORS: invite player to guild - mBrowserBox->addRow("guild", _("Invite to guild")); + mBrowserBox->addRow("/guild 'NAME'", + _("Invite to guild")); } } } @@ -522,7 +523,7 @@ void PopupMenu::showPlayerPopup(const std::string &nick) { // TRANSLATORS: popup menu item // TRANSLATORS: invite player to guild - mBrowserBox->addRow("guild", _("Invite to guild")); + mBrowserBox->addRow("/guild 'NAME'", _("Invite to guild")); } } } @@ -843,7 +844,8 @@ void PopupMenu::showChatPopup(const int x, const int y, ChatTab *const tab) { // TRANSLATORS: popup menu item // TRANSLATORS: invite player to guild - mBrowserBox->addRow("guild", _("Invite to guild")); + mBrowserBox->addRow("/guild 'NAME'", + _("Invite to guild")); } } } @@ -979,22 +981,7 @@ void PopupMenu::handleLink(const std::string &link, if (actorManager) being = actorManager->findBeing(mBeingId); - // Guild action - if (link == "guild" && !mNick.empty()) - { - if (localPlayer) - { - const Guild *const guild = localPlayer->getGuild(); - if (guild) - { - if (guild->getServerGuild()) - guildHandler->invite(guild->getId(), mNick); - else if (guildManager) - guildManager->invite(mNick); - } - } - } - else if (link == "nuke" && being) + if (link == "nuke" && being) { if (actorManager) { |