From bccf523c0320f1f8f33edb72caec0a67cfa2e422 Mon Sep 17 00:00:00 2001 From: Stas'M Date: Wed, 31 Jul 2019 19:22:35 +0300 Subject: [PATCH] Console: Parsing flag should be set by default - addendum to 5c79a5c Because g_Options_SetDefaultVideo() is called earlier, and it calls g_Console_ResetBinds(). --- src/game/g_console.pas | 3 +-- src/game/g_options.pas | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/game/g_console.pas b/src/game/g_console.pas index 35f86b6..edf484f 100644 --- a/src/game/g_console.pas +++ b/src/game/g_console.pas @@ -78,7 +78,7 @@ var gChatTeam: Boolean = false; gAllowConsoleMessages: Boolean = true; gJustChatted: Boolean = false; // ÷òîáû àäìèí â èíòåðå ÷àòÿñü íå ïðîìàòûâàë ñòàòèñòèêó - gParsingBinds: Boolean = false; // íå ïåðåñîõðàíÿòü êîíôèã âî âðåìÿ ïàðñèíãà + gParsingBinds: Boolean = true; // íå ïåðåñîõðàíÿòü êîíôèã âî âðåìÿ ïàðñèíãà gPlayerAction: Array [0..1, 0..LAST_ACTION] of Boolean; // [player, action] implementation @@ -977,7 +977,6 @@ begin WhitelistCommand('g_scorelimit'); WhitelistCommand('g_timelimit'); - gParsingBinds := True; g_Console_ResetBinds; g_Console_ReadConfig(GameDir + '/dfconfig.cfg'); g_Console_ReadConfig(GameDir + '/autoexec.cfg'); diff --git a/src/game/g_options.pas b/src/game/g_options.pas index fa88259..a548650 100644 --- a/src/game/g_options.pas +++ b/src/game/g_options.pas @@ -164,7 +164,7 @@ begin gTextureFilter := True; glLegacyNPOT := False; e_LogWriteLn('g_Options_SetDefaultVideo: w = ' + IntToStr(gScreenWidth) + ' h = ' + IntToStr(gScreenHeight)); - g_Console_ResetBinds + g_Console_ResetBinds; end; procedure g_Options_SetDefault(); -- 2.29.2