[Scummvm-git-logs] scummvm master -> 95c1fa5a675e634cc363facdc337aed1c1fdb288

[bluegr]

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:
95c1fa5a67 GOB: Add workaround for incorrect Goblins 3 CD audio track strings


Commit: 95c1fa5a675e634cc363facdc337aed1c1fdb288
    https://github.com/scummvm/scummvm/commit/95c1fa5a675e634cc363facdc337aed1c1fdb288
Author: lawadr (3211473+lawadr at users.noreply.github.com)
Date: 2020-02-02T22:34:52+02:00

Commit Message:
GOB: Add workaround for incorrect Goblins 3 CD audio track strings

Changed paths:
    engines/gob/sound/sound.cpp


diff --git a/engines/gob/sound/sound.cpp b/engines/gob/sound/sound.cpp
index 000eafa..76f33da 100644
--- a/engines/gob/sound/sound.cpp
+++ b/engines/gob/sound/sound.cpp
@@ -625,7 +625,13 @@ void Sound::cdPlay(const Common::String &trackName) {
 // name in the scripts, and therefore doesn't play. This fixes the problem.
 	if ((_vm->getGameType() == kGameTypeFascination) && trackName.equalsIgnoreCase("boscle"))
 		_cdrom->startTrack("bosscle");
-	else
+// WORKAROUND - In Goblins 3 CD, in the chess room, a couple of tracks have the wrong name
+// in the scripts, and therefore don't play. This fixes the problem (ticket #11335). 
+	else if ((_vm->getGameType() == kGameTypeGob3) && trackName.matchString("ECHEQUI?")) {
+		char name[] = "ECHIQUI1";
+		name[7] = trackName[7];
+		_cdrom->startTrack(name);
+	} else
 		_cdrom->startTrack(trackName.c_str());
 }