From 57fbb242575a647b3323ede64670d0a7094189e9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 22 Mar 2015 17:41:58 +0300 Subject: 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. --- src/input/inputaction.h | 1 + src/input/inputactionmap.h | 5 +++++ src/input/pages/outfits.cpp | 6 ++++++ 3 files changed, 12 insertions(+) (limited to 'src/input') 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 @@ -56,6 +56,12 @@ SetupActionData setupActionDataOutfits[] = InputAction::COPY_EQUIPED_OUTFIT, "", }, + { + // TRANSLATORS: input action name + N_("Show hat in chat"), + InputAction::HAT, + "", + }, { // TRANSLATORS: input action name N_("Outfits shortcuts"), -- cgit v1.2.3-60-g2f50