summaryrefslogtreecommitdiff
path: root/src/actions
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-22 20:43:46 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-22 20:43:46 +0300
commitbda7b8cc0776456e8d392be45be9b74183cf0f37 (patch)
treea473856f7744dcd2085e6c237ebde1bac2c23ce7 /src/actions
parent21fb62f9747578a7a81ccfa94369429fba4d4cc1 (diff)
downloadplus-bda7b8cc0776456e8d392be45be9b74183cf0f37.tar.gz
plus-bda7b8cc0776456e8d392be45be9b74183cf0f37.tar.bz2
plus-bda7b8cc0776456e8d392be45be9b74183cf0f37.tar.xz
plus-bda7b8cc0776456e8d392be45be9b74183cf0f37.zip
Add chat command for move mercenary to master.
Diffstat (limited to 'src/actions')
-rw-r--r--src/actions/actions.cpp7
-rw-r--r--src/actions/actions.h1
2 files changed, 8 insertions, 0 deletions
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);