diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-03-08 12:29:10 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-03-08 12:29:10 +0300 |
| commit | d1c4cb3675600137d0239ac7bdfc91062592804a (patch) | |
| tree | e09c62c2e8a796bb745e0e3c2ed86810327ea3c5 /src/input | |
| parent | 905bfd0ad38d7101f99f38b00044d9f192cc664d (diff) | |
| download | plus-d1c4cb3675600137d0239ac7bdfc91062592804a.tar.gz plus-d1c4cb3675600137d0239ac7bdfc91062592804a.tar.bz2 plus-d1c4cb3675600137d0239ac7bdfc91062592804a.tar.xz plus-d1c4cb3675600137d0239ac7bdfc91062592804a.zip | |
Move guild-kick from popup manager into actions.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/inputaction.h | 1 | ||||
| -rw-r--r-- | src/input/inputactionmap.h | 5 |
2 files changed, 6 insertions, 0 deletions
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 |