[Scummvm-git-logs] scummvm master -> fbc184e3d9d00c6e894f71c98e6f7b05cf6afe0c

[dreammaster]

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:
fbc184e3d9 XEEN: Flag games as not having voice


Commit: fbc184e3d9d00c6e894f71c98e6f7b05cf6afe0c
    https://github.com/scummvm/scummvm/commit/fbc184e3d9d00c6e894f71c98e6f7b05cf6afe0c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-02-18T21:48:50-05:00

Commit Message:
XEEN: Flag games as not having voice

Technically they do have voice samples, but the code for playing
them is indistinguishable from standard SFX. And given how few
they are, I feel it better for now to simply flag the detection
entries as no voice, rather than trying to separate them

Changed paths:
    engines/xeen/detection_tables.h
    engines/xeen/xeen.cpp


diff --git a/engines/xeen/detection_tables.h b/engines/xeen/detection_tables.h
index 07aeef5..220c1f1 100644
--- a/engines/xeen/detection_tables.h
+++ b/engines/xeen/detection_tables.h
@@ -36,7 +36,7 @@ static const XeenGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
+			GUIO1(GUIO_NOSPEECH)
 		},
 		GType_WorldOfXeen,
 		0
@@ -55,7 +55,7 @@ static const XeenGameDescription gameDescriptions[] = {
 			Common::DE_DEU,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE),
+			GUIO1(GUIO_NOSPEECH),
 		},
 		GType_WorldOfXeen,
 		0
@@ -74,7 +74,7 @@ static const XeenGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
+			GUIO1(GUIO_NOSPEECH)
 		},
 		GType_WorldOfXeen,
 		0
@@ -92,7 +92,7 @@ static const XeenGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
+			GUIO1(GUIO_NOSPEECH)
 		},
 		GType_Clouds,
 		0
@@ -110,7 +110,7 @@ static const XeenGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
+			GUIO1(GUIO_NOSPEECH)
 		},
 		GType_DarkSide,
 		0
@@ -128,7 +128,7 @@ static const XeenGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NONE)
+			GUIO1(GUIO_NOSPEECH)
 		},
 		GType_Swords,
 		0
diff --git a/engines/xeen/xeen.cpp b/engines/xeen/xeen.cpp
index 3dfb0bc..b4393fd 100644
--- a/engines/xeen/xeen.cpp
+++ b/engines/xeen/xeen.cpp
@@ -110,6 +110,9 @@ void XeenEngine::initialize() {
 	// Set graphics mode
 	initGraphics(320, 200);
 
+	// Setup mixer
+	syncSoundSettings();
+
 	// If requested, load a savegame instead of showing the intro
 	if (ConfMan.hasKey("save_slot")) {
 		int saveSlot = ConfMan.getInt("save_slot");
@@ -247,6 +250,8 @@ Common::String XeenEngine::printK2(uint value) {
 }
 
 void XeenEngine::syncSoundSettings() {
+	Engine::syncSoundSettings();
+
 	if (_sound)
 		_sound->updateSoundSettings();
 }