From 83e321dee047413f760e8372666e155f30f89bb8 Mon Sep 17 00:00:00 2001 From: DeaDDooMER Date: Tue, 7 Feb 2023 18:35:46 +0300 Subject: [PATCH] gui: do not allow rebind `togglemenu` via menu --- src/game/g_gui.pas | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/g_gui.pas b/src/game/g_gui.pas index 415d7ef..b8b1999 100644 --- a/src/game/g_gui.pas +++ b/src/game/g_gui.pas @@ -552,7 +552,7 @@ implementation uses {$INCLUDE ../nogl/noGLuses.inc} g_textures, g_sound, SysUtils, e_res, - g_game, Math, StrUtils, g_player, g_options, + g_game, Math, StrUtils, g_player, g_options, g_console, g_map, g_weapons, xdynrec, wadreader; @@ -2472,7 +2472,7 @@ begin actDefCtl(); end; else - if e_KeyNames[wParam] <> '' then + if (e_KeyNames[wParam] <> '') and not g_Console_MatchBind(wParam, 'togglemenu') then FKey := wParam; FIsQuery := False; actDefCtl(); @@ -2620,7 +2620,7 @@ begin actDefCtl(); end; else - if e_KeyNames[wParam] <> '' then + if (e_KeyNames[wParam] <> '') and not g_Console_MatchBind(wParam, 'togglemenu') then begin if (FKeyIdx = 0) then FKey0 := wParam else FKey1 := wParam; end; -- 2.29.2