[Scummvm-git-logs] scummvm master -> 6a4dbad4f2f66df4bdb8dce174c3ce945409f417

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
6a4dbad4f2 WINTERMUTE: fix sotv1 package paths


Commit: 6a4dbad4f2f66df4bdb8dce174c3ce945409f417
    https://github.com/scummvm/scummvm/commit/6a4dbad4f2f66df4bdb8dce174c3ce945409f417
Author: Dario Scarpa (3518552+darioscarpa at users.noreply.github.com)
Date: 2026-01-17T14:50:08+01:00

Commit Message:
WINTERMUTE: fix sotv1 package paths

In an earlier commit of mine (#e31ae41), porting the logic of the game
launcher code, I missed a package (the one named along the
i18n_$LANG_$HDORSD pattern). For the occasion, I simplified and made
clearer the loading of the other packages too.

Changed paths:
    engines/wintermute/base/base_file_manager.cpp


diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index 8a2e64ec382..ea35d604d38 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -207,12 +207,17 @@ bool BaseFileManager::initPaths() {
 	// Windows registry a suitable "PackagePaths" entry. Such entry is then used
 	// by WME on startup to load only the subset of the available packages which
 	// is relevant to the selected options, avoiding incorrect overrides.
+	const char *gameVersion = use_sd_assets ? "sd" : "hd";
+	const char *voicesLang = use_it_voices ? "it" : "en";
+	const char *subtitleLang = Common::getLanguageCode(lang);
+
 	Common::Array<Common::String> sotvSubfolders;
 	sotvSubfolders.push_back("common");
-	sotvSubfolders.push_back(use_sd_assets ? "common_sd" : "common_hd");
-	sotvSubfolders.push_back(use_it_voices ? "i18n_audio_it" : "i18n_audio_en");
-	sotvSubfolders.push_back(Common::String::format("i18n_%s", Common::getLanguageCode(lang)));
-	sotvSubfolders.push_back(Common::String::format("i18n_%s_%s", Common::getLanguageCode(lang), use_sd_assets ? "sd" : "hd"));
+	sotvSubfolders.push_back(Common::String::format("common_%s", gameVersion));
+	sotvSubfolders.push_back(Common::String::format("i18n_audio_%s", voicesLang));
+	sotvSubfolders.push_back(Common::String::format("i18n_audio_%s_%s", voicesLang, gameVersion));
+	sotvSubfolders.push_back(Common::String::format("i18n_%s", subtitleLang));
+	sotvSubfolders.push_back(Common::String::format("i18n_%s_%s", subtitleLang, gameVersion));
 	for (const auto &sotvSubfolder : sotvSubfolders) {
 		Common::FSNode subFolder = gameData.getChild(sotvSubfolder);
 		if (subFolder.exists()) {