From 8b649178ce7aaabaf9f37a9d6274ef747b509e1f Mon Sep 17 00:00:00 2001
From: Arnaud Boutonné
Date: Sun, 15 Aug 2010 23:40:24 +0000
Subject: Fascination - Add workaround for script bug: wrong track name is
 called in storage room

svn-id: r52107
---
 engines/gob/sound/sound.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'engines/gob/sound/sound.cpp')

diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp
index f2b9004a41..83da3e06c2 100644
--- a/engines/gob/sound/sound.cpp
+++ b/engines/gob/sound/sound.cpp
@@ -612,7 +612,11 @@ void Sound::cdPlay(const char *trackName) {
 		return;
 
 	debugC(1, kDebugSound, "CDROM: Playing track \"%s\"", trackName);
-	_cdrom->startTrack(trackName);
+	if ((_vm->getGameType() == kGameTypeFascination) && !scumm_stricmp(trackName, "boscle")) {
+		warning("Using bosscle instead of boscle");
+		_cdrom->startTrack("bosscle");
+	} else
+		_cdrom->startTrack(trackName);
 }
 
 void Sound::cdStop() {
-- 
cgit v1.2.3


From bdedf90c59ef28a999a3d13d8d2987f896cf31a6 Mon Sep 17 00:00:00 2001
From: Arnaud Boutonné
Date: Tue, 17 Aug 2010 19:04:04 +0000
Subject: Suppress one more useless debug message

svn-id: r52162
---
 engines/gob/sound/sound.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'engines/gob/sound/sound.cpp')

diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp
index 83da3e06c2..5abc94d025 100644
--- a/engines/gob/sound/sound.cpp
+++ b/engines/gob/sound/sound.cpp
@@ -613,7 +613,6 @@ void Sound::cdPlay(const char *trackName) {
 
 	debugC(1, kDebugSound, "CDROM: Playing track \"%s\"", trackName);
 	if ((_vm->getGameType() == kGameTypeFascination) && !scumm_stricmp(trackName, "boscle")) {
-		warning("Using bosscle instead of boscle");
 		_cdrom->startTrack("bosscle");
 	} else
 		_cdrom->startTrack(trackName);
-- 
cgit v1.2.3


From 5cd3ea41db71b4521954cd65bc9775c1bbeabb9f Mon Sep 17 00:00:00 2001
From: Arnaud Boutonné
Date: Sat, 21 Aug 2010 18:16:04 +0000
Subject: GOB: Clean up of Fascination code Move Fascination specific function
 to appropriate classes, plus some style modifications

svn-id: r52267
---
 engines/gob/sound/sound.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'engines/gob/sound/sound.cpp')

diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp
index 5abc94d025..bc4495fafd 100644
--- a/engines/gob/sound/sound.cpp
+++ b/engines/gob/sound/sound.cpp
@@ -610,11 +610,13 @@ void Sound::cdPlayMultMusic() {
 void Sound::cdPlay(const char *trackName) {
 	if (!_cdrom)
 		return;
-
 	debugC(1, kDebugSound, "CDROM: Playing track \"%s\"", trackName);
-	if ((_vm->getGameType() == kGameTypeFascination) && !scumm_stricmp(trackName, "boscle")) {
+
+// WORKAROUND - In Fascination CD, in the storage room, a track has the wrong
+// name in the scripts, and therefore doesn't play. This fixes the problem.
+	if ((_vm->getGameType() == kGameTypeFascination) && !scumm_stricmp(trackName, "boscle"))
 		_cdrom->startTrack("bosscle");
-	} else
+	else
 		_cdrom->startTrack(trackName);
 }
 
-- 
cgit v1.2.3