From bda7b8cc0776456e8d392be45be9b74183cf0f37 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 22 Jun 2017 20:43:46 +0300
Subject: Add chat command for move mercenary to master.

---
 src/actions/actions.cpp | 7 +++++++
 src/actions/actions.h   | 1 +
 2 files changed, 8 insertions(+)

(limited to 'src/actions')

diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index f122a5c39..adc84b15f 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -1594,6 +1594,13 @@ impHandler0(mercenaryFire)
     return true;
 }
 
+impHandler0(mercenaryToMaster)
+{
+    if (mercenaryHandler != nullptr)
+        mercenaryHandler->moveToMaster();
+    return true;
+}
+
 impHandler(useItem)
 {
     const int itemId = atoi(event.args.c_str());
diff --git a/src/actions/actions.h b/src/actions/actions.h
index 2fed641aa..bfacd0434 100644
--- a/src/actions/actions.h
+++ b/src/actions/actions.h
@@ -101,6 +101,7 @@ namespace Actions
     decHandler(uploadServerConfig);
     decHandler(uploadLog);
     decHandler(mercenaryFire);
+    decHandler(mercenaryToMaster);
     decHandler(useItem);
     decHandler(useItemInv);
     decHandler(invToStorage);
-- 
cgit v1.2.3-60-g2f50