[Scummvm-git-logs] scummvm master -> 2ff96c0277adac5768478c5616600fdb42ac3b3d

dreammaster dreammaster at scummvm.org
Fri Mar 16 02:10:33 CET 2018


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:
2ff96c0277 XEEN: Further convertion of playSound to playVoice for location voice samples


Commit: 2ff96c0277adac5768478c5616600fdb42ac3b3d
    https://github.com/scummvm/scummvm/commit/2ff96c0277adac5768478c5616600fdb42ac3b3d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-15T21:10:22-04:00

Commit Message:
XEEN: Further convertion of playSound to playVoice for location voice samples

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


diff --git a/engines/xeen/detection_tables.h b/engines/xeen/detection_tables.h
index 2b09d2b..c311bde 100644
--- a/engines/xeen/detection_tables.h
+++ b/engines/xeen/detection_tables.h
@@ -55,7 +55,7 @@ static const XeenGameDescription gameDescriptions[] = {
 			Common::DE_DEU,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO0(),
+			GUIO0()
 		},
 		GType_WorldOfXeen,
 		0
@@ -128,7 +128,7 @@ static const XeenGameDescription gameDescriptions[] = {
 			Common::EN_ANY,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
-			GUIO1(GUIO_NOSPEECH)
+			GUIO0()
 		},
 		GType_Swords,
 		0
diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp
index be97b63..0376cdb 100644
--- a/engines/xeen/locations.cpp
+++ b/engines/xeen/locations.cpp
@@ -83,7 +83,7 @@ int BaseLocation::show() {
 	drawAnim(true);
 
 	// Play the welcome speech
-	sound.playSound(_vocName, 1);
+	sound.playVoice(_vocName, 1);
 
 	do {
 		wait();
@@ -481,7 +481,7 @@ void BlacksmithLocation::farewell() {
 
 	if (_isDarkCc) {
 		sound.stopSound();
-		sound.playSound("come1.voc", 1);
+		sound.playVoice("come1.voc", 1);
 	}
 }
 
@@ -786,7 +786,7 @@ void TavernLocation::farewell() {
 	Sound &sound = *g_vm->_sound;
 
 	sound.stopSound();
-	sound.playSound(_isDarkCc ? "gdluck1.voc" : "goodbye.voc", 1);
+	sound.playVoice(_isDarkCc ? "gdluck1.voc" : "goodbye.voc", 1);
 
 	map.mazeData()._mazeNumber = party._mazeId;
 }





More information about the Scummvm-git-logs mailing list