summaryrefslogtreecommitdiff
path: root/src/actions/actions.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-10 02:03:33 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-10 02:03:33 +0300
commitb97afbb756202e148b980b3311e2c4cc3dd1cbaf (patch)
tree15c45e87fe175155a219fa9e50bc6ff74b2cc1e4 /src/actions/actions.cpp
parentd94f088b0f81fb114980830d8fb53a5ee911b6e6 (diff)
downloadmv-b97afbb756202e148b980b3311e2c4cc3dd1cbaf.tar.gz
mv-b97afbb756202e148b980b3311e2c4cc3dd1cbaf.tar.bz2
mv-b97afbb756202e148b980b3311e2c4cc3dd1cbaf.tar.xz
mv-b97afbb756202e148b980b3311e2c4cc3dd1cbaf.zip
Add ability to switch emotes shortcurs bar between player, pets, homunculuses and mercenaries.
Diffstat (limited to 'src/actions/actions.cpp')
-rw-r--r--src/actions/actions.cpp26
1 files changed, 25 insertions, 1 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index 5a461f522..9c9cfa092 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -320,7 +320,7 @@ impHandler(emote)
if (emotion > 0)
{
if (emoteShortcut)
- emoteShortcut->useEmote(emotion);
+ emoteShortcut->useEmotePlayer(emotion);
if (Game::instance())
Game::instance()->setValidSpeed();
return true;
@@ -1792,4 +1792,28 @@ impHandler(dumpMemoryUsage)
return true;
}
+impHandler(setEmoteType)
+{
+ const std::string &args = event.args;
+ if (args == "player" || args.empty())
+ {
+ settings.emoteType = EmoteType::Player;
+ }
+ else if (args == "pet")
+ {
+ settings.emoteType = EmoteType::Pet;
+ }
+#ifdef EATHENA_SUPPORT
+ else if (args == "homun" || args == "homunculus")
+ {
+ settings.emoteType = EmoteType::Homunculus;
+ }
+ else if (args == "merc" || args == "mercenary")
+ {
+ settings.emoteType = EmoteType::Mercenary;
+ }
+#endif
+ return true;
+}
+
} // namespace Actions