From 97868ad421f8587ffedda5392ac0af2c3fecc7bb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 5 Apr 2015 22:29:14 +0300 Subject: Add chat command for leave chat room. New chat command: /leaveroom --- src/actions/commands.cpp | 10 ++++++++++ src/actions/commands.h | 1 + src/input/inputaction.h | 1 + src/input/inputactionmap.h | 5 +++++ 4 files changed, 17 insertions(+) (limited to 'src') diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp index 18206b9a3..04a69fddd 100644 --- a/src/actions/commands.cpp +++ b/src/actions/commands.cpp @@ -898,4 +898,14 @@ impHandler(joinChatRoom) #endif } +impHandler(leaveChatRoom) +{ +#ifdef EATHENA_SUPPORT + chatHandler->leaveChatRoom(); + return true; +#else + return false; +#endif +} + } // namespace Actions diff --git a/src/actions/commands.h b/src/actions/commands.h index ef02a70eb..da3574a62 100644 --- a/src/actions/commands.h +++ b/src/actions/commands.h @@ -84,6 +84,7 @@ namespace Actions decHandler(commandHomunEmote); decHandler(createPublicChatRoom); decHandler(joinChatRoom); + decHandler(leaveChatRoom); } // namespace Actions #undef decHandler diff --git a/src/input/inputaction.h b/src/input/inputaction.h index dba7a2a91..f39b1864b 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -593,6 +593,7 @@ namespace InputAction HAT, CREATE_PUBLIC_ROOM, JOIN_ROOM, + LEAVE_ROOM, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index f923e2000..9d6293628 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -4446,6 +4446,11 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::INGAME, "joinroom", true}, + {"keyLeaveRoom", + defaultAction(&Actions::leaveChatRoom), + InputCondition::INGAME, + "leaveroom", + false}, }; #undef defaultAction -- cgit v1.2.3-70-g09d2