Normalize and resolve asset bundle paths

alexbatalov · Apr 6, 2024 · ec0685e · ec0685e
1 parent 2c7ab7f
commit ec0685e
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/src/game_config.cc b/src/game_config.cc
@@ -10,6 +10,8 @@
 
 namespace fallout {
 
+static void gameConfigResolvePath(const char* section, const char* key);
+
 // A flag indicating if [gGameConfig] was initialized.
 //
 // 0x5186D0
@@ -181,6 +183,15 @@ bool gameConfigInit(bool isMapper, int argc, char** argv)
     // whatever was loaded from `fallout2.cfg`.
     configParseCommandLineArguments(&gGameConfig, argc, argv);
 
+    // CE: Normalize and resolve asset bundle paths.
+    gameConfigResolvePath(GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_MASTER_DAT_KEY);
+    gameConfigResolvePath(GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_MASTER_PATCHES_KEY);
+    gameConfigResolvePath(GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_CRITTER_DAT_KEY);
+    gameConfigResolvePath(GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_CRITTER_PATCHES_KEY);
+    gameConfigResolvePath(GAME_CONFIG_SYSTEM_KEY, GAME_CONFIG_CRITTER_PATCHES_KEY);
+    gameConfigResolvePath(GAME_CONFIG_SOUND_KEY, GAME_CONFIG_MUSIC_PATH1_KEY);
+    gameConfigResolvePath(GAME_CONFIG_SOUND_KEY, GAME_CONFIG_MUSIC_PATH2_KEY);
+
     gGameConfigInitialized = true;
 
     return true;
@@ -226,4 +237,12 @@ bool gameConfigExit(bool shouldSave)
     return result;
 }
 
+static void gameConfigResolvePath(const char* section, const char* key)
+{
+    char* path;
+    configGetString(&gGameConfig, section, key, &path);
+    compat_windows_path_to_native(path);
+    compat_resolve_path(path);
+}
+
 } // namespace fallout