From 3a18f41637bcde3005f963174ced49b758768209 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+Agent-11@users.noreply.github.com> Date: Wed, 6 Dec 2023 20:03:40 -0500 Subject: [PATCH] Save console key --- src/pc/configfile.c | 1 + src/pc/djui/djui_interactable.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pc/configfile.c b/src/pc/configfile.c index e789fdf5e..a8d250172 100644 --- a/src/pc/configfile.c +++ b/src/pc/configfile.c @@ -204,6 +204,7 @@ static const struct ConfigOption options[] = { {.name = "key_prev", .type = CONFIG_TYPE_BIND, .uintValue = configKeyPrevPage}, {.name = "key_next", .type = CONFIG_TYPE_BIND, .uintValue = configKeyNextPage}, {.name = "key_disconnect", .type = CONFIG_TYPE_BIND, .uintValue = configKeyDisconnect}, + {.name = "key_console", .type = CONFIG_TYPE_BIND, .uintValue = configKeyConsole}, {.name = "stick_deadzone", .type = CONFIG_TYPE_UINT, .uintValue = &configStickDeadzone}, {.name = "rumble_strength", .type = CONFIG_TYPE_UINT, .uintValue = &configRumbleStrength}, {.name = "bettercam_enable", .type = CONFIG_TYPE_BOOL, .boolValue = &configEnableCamera}, diff --git a/src/pc/djui/djui_interactable.c b/src/pc/djui/djui_interactable.c index c0627e534..8de296a89 100644 --- a/src/pc/djui/djui_interactable.c +++ b/src/pc/djui/djui_interactable.c @@ -199,8 +199,10 @@ bool djui_interactable_on_key_down(int scancode) { return true; } - for (int i = 0; i < MAX_BINDS; i++) { - if (scancode == (int)configKeyConsole[i]) { djui_console_toggle(); } + if (!gDjuiChatBoxFocus && gDjuiChatBox != NULL) { + for (int i = 0; i < MAX_BINDS; i++) { + if (scancode == (int)configKeyConsole[i]) { djui_console_toggle(); break; } + } } bool keyFocused = (gInteractableFocus != NULL)