summaryrefslogtreecommitdiff
path: root/src/actions
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-21 17:22:29 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-21 17:24:16 +0300
commitd26b49843ee33ca927cc46edc8cc0bdfe97a903a (patch)
tree3edffa15445a159d0533fa86568adfb576bbb32d /src/actions
parent5b907fc3c1c21f69f1b86d4e3c16990dd2bff757 (diff)
downloadmv-d26b49843ee33ca927cc46edc8cc0bdfe97a903a.tar.gz
mv-d26b49843ee33ca927cc46edc8cc0bdfe97a903a.tar.bz2
mv-d26b49843ee33ca927cc46edc8cc0bdfe97a903a.tar.xz
mv-d26b49843ee33ca927cc46edc8cc0bdfe97a903a.zip
Add chat command and action for fire mercenary.
New chat command: /firemercenary.
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 1c6fc3194..f1c62441d 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -66,6 +66,7 @@
#include "net/download.h"
#include "net/gamehandler.h"
#include "net/ipc.h"
+#include "net/mercenaryhandler.h"
#include "net/net.h"
#include "net/pethandler.h"
#include "net/playerhandler.h"
@@ -1174,4 +1175,10 @@ impHandler(catchPet)
return true;
}
+impHandler0(mercenaryFire)
+{
+ mercenaryHandler->fire();
+ return true;
+}
+
} // namespace Actions
diff --git a/src/actions/actions.h b/src/actions/actions.h
index d03c8b8ac..ed8cf980c 100644
--- a/src/actions/actions.h
+++ b/src/actions/actions.h
@@ -89,6 +89,7 @@ namespace Actions
decHandler(uploadServerConfig);
decHandler(uploadLog);
decHandler(catchPet);
+ decHandler(mercenaryFire);
} // namespace Actions
#undef decHandler