summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-03-22 17:41:58 +0300
committerAndrei Karas <akaras@inbox.ru>2015-03-22 17:41:58 +0300
commit57fbb242575a647b3323ede64670d0a7094189e9 (patch)
tree32d337762734bb494e8641a6356da9a5cf48acea /src/input
parent82ceb77559198eb46d3a49beb50d130ccdce0afb (diff)
downloadmv-57fbb242575a647b3323ede64670d0a7094189e9.tar.gz
mv-57fbb242575a647b3323ede64670d0a7094189e9.tar.bz2
mv-57fbb242575a647b3323ede64670d0a7094189e9.tar.xz
mv-57fbb242575a647b3323ede64670d0a7094189e9.zip
Add adction for show equipped hat in chat.
New chat command: /hat Now irc with hats can show actual hat in chat. In some servers even in irc.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h5
-rw-r--r--src/input/pages/outfits.cpp6
3 files changed, 12 insertions, 0 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index 2eb89fc22..1fc45b6d1 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -590,6 +590,7 @@ namespace InputAction
HOMUN_EMOTE_47,
HOMUN_EMOTE_48,
KICK_GUILD,
+ HAT,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index a8d3853ac..d20201c79 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -4431,6 +4431,11 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputCondition::INGAME,
"kickguild|guildkick",
true},
+ {"keyHat",
+ defaultAction(&Actions::hat),
+ InputCondition::INGAME,
+ "hat|hats|showhat",
+ false},
};
#undef defaultAction
diff --git a/src/input/pages/outfits.cpp b/src/input/pages/outfits.cpp
index c554b5e28..20715a287 100644
--- a/src/input/pages/outfits.cpp
+++ b/src/input/pages/outfits.cpp
@@ -58,6 +58,12 @@ SetupActionData setupActionDataOutfits[] =
},
{
// TRANSLATORS: input action name
+ N_("Show hat in chat"),
+ InputAction::HAT,
+ "",
+ },
+ {
+ // TRANSLATORS: input action name
N_("Outfits shortcuts"),
InputAction::NO_VALUE,
""