Console: Parsing flag should be set by default - addendum to 5c79a5c

Because g_Options_SetDefaultVideo() is called earlier, and it calls g_Console_ResetBinds().

diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 35f86b6ec63b27cdc9408d4e36bd84416cc111c2..edf484f1dd8177dc59170710d0c48c6f4efeffb7 100644 (file)
--- 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; // ÷òîáû àäìèí â èíòåðå ÷àòÿñü íå ïðîìàòûâàë ñòàòèñòèêó
   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
   gPlayerAction: Array [0..1, 0..LAST_ACTION] of Boolean; // [player, action]
 
 implementation


@@ -977,7 +977,6 @@ begin
   WhitelistCommand('g_scorelimit');
   WhitelistCommand('g_timelimit');
 
   WhitelistCommand('g_scorelimit');
   WhitelistCommand('g_timelimit');
 

-  gParsingBinds := True;

   g_Console_ResetBinds;
   g_Console_ReadConfig(GameDir + '/dfconfig.cfg');
   g_Console_ReadConfig(GameDir + '/autoexec.cfg');
   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 fa88259bb75bd1c6a763e5afd59686293ca16368..a5486509c00bf029c02e98fa80e7750db0cd2f58 100644 (file)
--- 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));
   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();
 end;
 
 procedure g_Options_SetDefault();