[Scummvm-git-logs] scummvm master -> 0fb1d34165626522f1dea5e678dac7c828a97307

[mgerhardy]

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

Summary:
0fb1d34165 TWINE: add all voice subfolders


Commit: 0fb1d34165626522f1dea5e678dac7c828a97307
    https://github.com/scummvm/scummvm/commit/0fb1d34165626522f1dea5e678dac7c828a97307
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2023-03-27T06:24:40+02:00

Commit Message:
TWINE: add all voice subfolders

we are now able to switch the voices via in-game option, thus we also need
all the subfolders registered

Changed paths:
    engines/twine/twine.cpp


diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp
index d415607bc8f..af1fa131f86 100644
--- a/engines/twine/twine.cpp
+++ b/engines/twine/twine.cpp
@@ -145,25 +145,17 @@ TwinEEngine::TwinEEngine(OSystem *system, Common::Language language, uint32 flag
 		SearchMan.addSubDirectoryMatching(gameDataDir, "common/music");
 		SearchMan.addSubDirectoryMatching(gameDataDir, "common/midi");
 		SearchMan.addSubDirectoryMatching(gameDataDir, "commonclassic/images");
-		if (_gameLang == Common::Language::DE_DEU) {
-			SearchMan.addSubDirectoryMatching(gameDataDir, "commonclassic/voices/de_voice");
-		} else if (_gameLang == Common::Language::EN_ANY || _gameLang == Common::Language::EN_GRB || _gameLang == Common::Language::EN_USA) {
-			SearchMan.addSubDirectoryMatching(gameDataDir, "commonclassic/voices/en_voice");
-		} else if (_gameLang == Common::Language::FR_FRA) {
-			SearchMan.addSubDirectoryMatching(gameDataDir, "commonclassic/voices/fr_voice");
-		}
+		SearchMan.addSubDirectoryMatching(gameDataDir, "commonclassic/voices/de_voice");
+		SearchMan.addSubDirectoryMatching(gameDataDir, "commonclassic/voices/en_voice");
+		SearchMan.addSubDirectoryMatching(gameDataDir, "commonclassic/voices/fr_voice");
 	}
 
 	if (isDotEmuEnhanced()) {
 		SearchMan.addSubDirectoryMatching(gameDataDir, "resources/lba_files/hqr");
 		SearchMan.addSubDirectoryMatching(gameDataDir, "resources/lba_files/fla");
-		if (_gameLang == Common::Language::DE_DEU) {
-			SearchMan.addSubDirectoryMatching(gameDataDir, "resources/lba_files/vox/de_voice");
-		} else if (_gameLang == Common::Language::EN_ANY || _gameLang == Common::Language::EN_GRB || _gameLang == Common::Language::EN_USA) {
-			SearchMan.addSubDirectoryMatching(gameDataDir, "resources/lba_files/vox/en_voice");
-		} else if (_gameLang == Common::Language::FR_FRA) {
-			SearchMan.addSubDirectoryMatching(gameDataDir, "resources/lba_files/vox/fr_voice");
-		}
+		SearchMan.addSubDirectoryMatching(gameDataDir, "resources/lba_files/vox/de_voice");
+		SearchMan.addSubDirectoryMatching(gameDataDir, "resources/lba_files/vox/en_voice");
+		SearchMan.addSubDirectoryMatching(gameDataDir, "resources/lba_files/vox/fr_voice");
 		SearchMan.addSubDirectoryMatching(gameDataDir, "resources");
 #ifdef USE_MAD
 		SearchMan.addSubDirectoryMatching(gameDataDir, "resources/lba_files/music");