From d1c4cb3675600137d0239ac7bdfc91062592804a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 8 Mar 2015 12:29:10 +0300 Subject: Move guild-kick from popup manager into actions. --- src/input/inputaction.h | 1 + src/input/inputactionmap.h | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'src/input') diff --git a/src/input/inputaction.h b/src/input/inputaction.h index 7b7a5e4cc..2eb89fc22 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -589,6 +589,7 @@ namespace InputAction HOMUN_EMOTE_46, HOMUN_EMOTE_47, HOMUN_EMOTE_48, + KICK_GUILD, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 33cfc942f..ae75d2b2d 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -4431,6 +4431,11 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::GAME, "", false}, + {"keyKickGuild", + defaultAction(&Actions::kickGuild), + InputCondition::INGAME, + "kickguild|guildkick", + true}, }; #undef defaultAction -- cgit v1.2.3-70-g09d2