From 4e736ecaea7ec5bdaaa0ef9bb91373be8a2d1e2b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 14 Dec 2014 21:54:35 +0300 Subject: Add chat command for leave party. New chat command: /leaveparty Alias: /partyleave --- src/actions/commands.cpp | 7 +++++++ src/actions/commands.h | 1 + src/input/inputaction.h | 1 + src/input/inputactionmap.h | 9 +++++++++ 4 files changed, 18 insertions(+) diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp index dd93da0e8..07cd0c64e 100644 --- a/src/actions/commands.cpp +++ b/src/actions/commands.cpp @@ -46,6 +46,7 @@ #include "net/chathandler.h" #include "net/guildhandler.h" #include "net/homunculushandler.h" +#include "net/partyhandler.h" #include "net/pethandler.h" #include "net/serverfeatures.h" @@ -814,4 +815,10 @@ impHandler0(fireHomunculus) return true; } +impHandler0(leaveParty) +{ + partyHandler->leave(); + return true; +} + } // namespace Actions diff --git a/src/actions/commands.h b/src/actions/commands.h index 0aa226cb8..3b69535a3 100644 --- a/src/actions/commands.h +++ b/src/actions/commands.h @@ -80,6 +80,7 @@ namespace Actions decHandler(setPetName); decHandler(setHomunculusName); decHandler(fireHomunculus); + decHandler(leaveParty); } // namespace Actions #undef decHandler diff --git a/src/input/inputaction.h b/src/input/inputaction.h index d09099c84..e4f96d06a 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -513,6 +513,7 @@ namespace InputAction KICK_PARTY, ADD_TEXT, KICK, + LEAVE_PARTY, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 28def4d1b..e93d6029c 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -4360,6 +4360,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::INGAME, "kick", true}, + {"keyLeaveParty", + InputType::UNKNOWN, InputAction::NO_VALUE, + InputType::UNKNOWN, InputAction::NO_VALUE, + Input::GRP_DEFAULT, + &Actions::leaveParty, + InputAction::NO_VALUE, 50, + InputCondition::INGAME, + "leaveparty|partyleave", + true}, }; #endif // INPUT_INPUTACTIONMAP_H -- cgit v1.2.3-60-g2f50