summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-05 22:29:14 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-06 01:56:21 +0300
commit97868ad421f8587ffedda5392ac0af2c3fecc7bb (patch)
tree4ec8dcbe93c3eb7bac899721a934f6651bb9fc2d /src
parent4b5f5a0718db7074c32be2fff266a6bf77dbb518 (diff)
downloadmv-97868ad421f8587ffedda5392ac0af2c3fecc7bb.tar.gz
mv-97868ad421f8587ffedda5392ac0af2c3fecc7bb.tar.bz2
mv-97868ad421f8587ffedda5392ac0af2c3fecc7bb.tar.xz
mv-97868ad421f8587ffedda5392ac0af2c3fecc7bb.zip
Add chat command for leave chat room.
New chat command: /leaveroom
Diffstat (limited to 'src')
-rw-r--r--src/actions/commands.cpp10
-rw-r--r--src/actions/commands.h1
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h5
4 files changed, 17 insertions, 0 deletions
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