summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-23 15:23:12 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-23 15:23:12 +0300
commitf3fb75f3dfe916b95a0407fc7f680b954ba77504 (patch)
treeed3e652f3b23e7b5025a32d0cdf9397c2d66c5e8 /src/gui
parente83760a9b74131d7db25949b8b1bd69b8cb4c81d (diff)
downloadplus-f3fb75f3dfe916b95a0407fc7f680b954ba77504.tar.gz
plus-f3fb75f3dfe916b95a0407fc7f680b954ba77504.tar.bz2
plus-f3fb75f3dfe916b95a0407fc7f680b954ba77504.tar.xz
plus-f3fb75f3dfe916b95a0407fc7f680b954ba77504.zip
Add into mercenary context menu option to fire it.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popups/popupmenu.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 0af61c219..6cfecae78 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -71,6 +71,7 @@
#include "net/chathandler.h"
#include "net/guildhandler.h"
#include "net/inventoryhandler.h"
+#include "net/mercenaryhandler.h"
#include "net/net.h"
#include "net/npchandler.h"
#include "net/partyhandler.h"
@@ -301,6 +302,13 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being)
break;
}
+ case ActorType::Mercenary:
+ // TRANSLATORS: popup menu item
+ // TRANSLATORS: fire mercenary
+ mBrowserBox->addRow("fire mercenary", _("Fire"));
+ mBrowserBox->addRow("##3---");
+ break;
+
case ActorType::Avatar:
case ActorType::Unknown:
case ActorType::FloorItem:
@@ -1828,6 +1836,10 @@ void PopupMenu::handleLink(const std::string &link,
if (chat)
chatHandler->joinChat(chat, "");
}
+ else if (link == "fire mercenary")
+ {
+ mercenaryHandler->fire();
+ }
else if (!link.compare(0, 10, "guild-pos-"))
{
if (localPlayer)