From: Holger Schemel Date: Sun, 3 Sep 2023 20:51:33 +0000 (+0200) Subject: added wrapper functions to initialize and set variables X-Git-Tag: 4.3.7.0~35 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=e36017b063bc3969a86a1e64e8ce184e451b1a5d;p=rocksndiamonds.git added wrapper functions to initialize and set variables --- diff --git a/src/files.c b/src/files.c index c484acee..69ef8a52 100644 --- a/src/files.c +++ b/src/files.c @@ -12345,9 +12345,9 @@ static void InitMenuDesignSettings_SpecialPostProcessing_AfterGraphics(void) } } -static void InitMenuDesignSettings_PreviewPlayers_FromHash(SetupFileHash *hash) +static void InitMenuDesignSettings_PreviewPlayers_Ext(SetupFileHash *hash, + boolean initialize) { - // special case: check if network and preview player positions are redefined, // to compare this later against the main menu level preview being redefined struct TokenIntPtrInfo menu_config_players[] = @@ -12361,12 +12361,27 @@ static void InitMenuDesignSettings_PreviewPlayers_FromHash(SetupFileHash *hash) }; int i; - for (i = 0; i < ARRAY_SIZE(menu_config_players); i++) - *menu_config_players[i].value = FALSE; + if (initialize) + { + for (i = 0; i < ARRAY_SIZE(menu_config_players); i++) + *menu_config_players[i].value = FALSE; + } + else + { + for (i = 0; i < ARRAY_SIZE(menu_config_players); i++) + if (getHashEntry(hash, menu_config_players[i].token) != NULL) + *menu_config_players[i].value = TRUE; + } +} + +static void InitMenuDesignSettings_PreviewPlayers(void) +{ + InitMenuDesignSettings_PreviewPlayers_Ext(NULL, TRUE); +} - for (i = 0; i < ARRAY_SIZE(menu_config_players); i++) - if (getHashEntry(hash, menu_config_players[i].token) != NULL) - *menu_config_players[i].value = TRUE; +static void InitMenuDesignSettings_PreviewPlayers_FromHash(SetupFileHash *hash) +{ + InitMenuDesignSettings_PreviewPlayers_Ext(hash, FALSE); } static void LoadMenuDesignSettingsFromFilename(char *filename) @@ -12711,6 +12726,7 @@ static void LoadMenuDesignSettingsFromFilename(char *filename) } // special case: check if network and preview player positions are redefined + InitMenuDesignSettings_PreviewPlayers(); InitMenuDesignSettings_PreviewPlayers_FromHash(setup_file_hash); // read (and overwrite with) values that may be specified in config file