From 72ea257a063f10ada40a6a63ed401b56684f8eba Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 23 Apr 2025 13:10:07 +0200 Subject: [PATCH] we have a global to check if config was loaded --- src/d_main.c | 6 ++++-- src/m_misc.c | 7 +------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index ad65138e8..44511b87d 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -147,7 +147,7 @@ INT32 eventhead, eventtail; boolean dedicated = false; -boolean loaded_config = false; +boolean loaded_config = false; // true once config.cfg loaded AND executed // // D_PostEvent @@ -1881,7 +1881,9 @@ void D_SRB2Main(void) savedata.lives = 0; // flag this as not-used - loaded_config = true; // so pallettechange doesent get called 500 times at startup lol + // make sure I_Quit() will write back the correct config + // (do not write back the config if it crash before) + loaded_config = true; // so palettechange doesent get called 500 times at startup lol //------------------------------------------------ COMMAND LINE PARAMS diff --git a/src/m_misc.c b/src/m_misc.c index ca4b745ed..ff9892464 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -443,7 +443,6 @@ char configfile[MAX_WADPATH]; // ========================================================================== // CONFIGURATION // ========================================================================== -static boolean gameconfig_loaded = false; // true once config.cfg loaded AND executed /** Saves a player's config, possibly to a particular file. * @@ -548,10 +547,6 @@ void M_FirstLoadConfig(void) // don't filter anymore vars and don't let this convsvar be changed COM_BufInsertText(va("%s \"%d\"\n", cv_execversion.name, EXECVERSION)); CV_ToggleExecVersion(false); - - // make sure I_Quit() will write back the correct config - // (do not write back the config if it crash before) - gameconfig_loaded = true; } /** Saves the game configuration. @@ -565,7 +560,7 @@ void M_SaveConfig(const char *filename) char backupfile[MAX_WADPATH+4]; // make sure not to write back the config until it's been correctly loaded - if (!gameconfig_loaded) + if (!loaded_config) return; // Create backup of the config file