From 3ceacf10012e3e621dd51b1ebca091d921328509 Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Sat, 6 Apr 2024 12:01:48 +0300 Subject: [PATCH] Fix warning --- src/game_config.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/game_config.cc b/src/game_config.cc index 6716247..75620c2 100644 --- a/src/game_config.cc +++ b/src/game_config.cc @@ -121,13 +121,13 @@ bool gameConfigInit(bool isMapper, int argc, char** argv) configSetInt(&gGameConfig, GAME_CONFIG_MAPPER_KEY, GAME_CONFIG_SORT_SCRIPT_LIST_KEY, 0); } - // SFALL: custom config file name. - char* configFileName = nullptr; - if (configGetString(&gSfallConfig, SFALL_CONFIG_MISC_KEY, SFALL_CONFIG_CONFIG_FILE, &configFileName)) { - if (configFileName == nullptr || *configFileName == '\0') { - configFileName = DEFAULT_GAME_CONFIG_FILE_NAME; - } - } + // SFALL: Custom config file name. + char* customConfigFileName = nullptr; + configGetString(&gSfallConfig, SFALL_CONFIG_MISC_KEY, SFALL_CONFIG_CONFIG_FILE, &customConfigFileName); + + const char* configFileName = customConfigFileName != nullptr && *customConfigFileName != '\0' + ? customConfigFileName + : DEFAULT_GAME_CONFIG_FILE_NAME; // Make `fallout2.cfg` file path. char* executable = argv[0];