summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
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