From bd44e8d0a94dd96e6f8eb0828b4f2b5de902ee83 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 5 Apr 2015 20:22:00 +0300
Subject: add chat command for join chat room.

New chat command: /joinroom NAME
---
 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 438075dcf..dba7a2a91 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -592,6 +592,7 @@ namespace InputAction
         KICK_GUILD,
         HAT,
         CREATE_PUBLIC_ROOM,
+        JOIN_ROOM,
         TOTAL
     };
 }  // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 78e23d819..f923e2000 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -4441,6 +4441,11 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
         InputCondition::INGAME,
         "createroom|createpublicroom",
         true},
+    {"keyJoinRoom",
+        defaultAction(&Actions::joinChatRoom),
+        InputCondition::INGAME,
+        "joinroom",
+        true},
 };
 
 #undef defaultAction
-- 
cgit v1.2.3-70-g09d2