summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-05 20:22:00 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-05 20:22:00 +0300
commitbd44e8d0a94dd96e6f8eb0828b4f2b5de902ee83 (patch)
tree28bfbcce0f7f34db5a42c7a27dfdac3a75b80e14 /src/input
parent84b6217136c8d59347ab9f28ec5e9e4d718d5058 (diff)
downloadmanaverse-bd44e8d0a94dd96e6f8eb0828b4f2b5de902ee83.tar.gz
manaverse-bd44e8d0a94dd96e6f8eb0828b4f2b5de902ee83.tar.bz2
manaverse-bd44e8d0a94dd96e6f8eb0828b4f2b5de902ee83.tar.xz
manaverse-bd44e8d0a94dd96e6f8eb0828b4f2b5de902ee83.zip
add chat command for join chat room.
New chat command: /joinroom NAME
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h5
2 files changed, 6 insertions, 0 deletions
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