Fix chat noclip

Closes #8
utf-4096 · Jan 12, 2023 · 2dd7511 · 2dd7511
1 parent 8381776
commit 2dd7511
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/cameracontroller.c b/src/cameracontroller.c
@@ -160,7 +160,7 @@ void cameracontroller_fps(float dt) {
 	}
 
 	if(chat_input_mode != CHAT_NO_INPUT) {
-		players[local_player_id].input.keys.packed = 0;
+		players[local_player_id].input.keys.packed &= 0b00100000;
 		players[local_player_id].input.buttons.packed = 0;
 	}
 

diff --git a/src/hud.c b/src/hud.c
@@ -1782,7 +1782,7 @@ static void hud_ingame_keyboard(int key, int action, int mods, int internal) {
 			} else if(key == WINDOW_KEY_YES) {
 				if(show_exit) {
 					hud_change(&hud_serverlist);
-				} else {
+				} else if(!window_key_down(WINDOW_KEY_CROUCH)) {
 					window_textinput(1);
 					chat_input_mode = CHAT_TEAM_INPUT;
 				}
@@ -1812,13 +1812,13 @@ static void hud_ingame_keyboard(int key, int action, int mods, int internal) {
 				chat_add(0, 0x00FFFF, volstr);
 			}
 
-			if(key == WINDOW_KEY_COMMAND) {
+			if(key == WINDOW_KEY_COMMAND && !window_key_down(WINDOW_KEY_CROUCH)) {
 				window_textinput(1);
 				chat_input_mode = CHAT_ALL_INPUT;
 				strcpy(chat[0][0], "/");
 			}
 
-			if(key == WINDOW_KEY_CHAT) {
+			if(key == WINDOW_KEY_CHAT && !window_key_down(WINDOW_KEY_CROUCH)) {
 				window_textinput(1);
 				chat_input_mode = CHAT_ALL_INPUT;
 			}