[Scummvm-cvs-logs] scummvm master -> 65ce5a89c96594847646b16fa0bc68329f1f16f1

dreammaster dreammaster at scummvm.org
Sat Oct 17 20:46:57 CEST 2015


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:
65ce5a89c9 SHERLOCK: RT: Fix incorrect music file after intro ends


Commit: 65ce5a89c96594847646b16fa0bc68329f1f16f1
    https://github.com/scummvm/scummvm/commit/65ce5a89c96594847646b16fa0bc68329f1f16f1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-10-17T14:46:21-04:00

Commit Message:
SHERLOCK: RT: Fix incorrect music file after intro ends

Changed paths:
    engines/sherlock/tattoo/tattoo_talk.cpp



diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp
index a4ceca0..a5ada7b 100644
--- a/engines/sherlock/tattoo/tattoo_talk.cpp
+++ b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -341,6 +341,10 @@ OpcodeReturn TattooTalk::cmdNextSong(const byte *&str) {
 		music._nextSongName += str[idx];
 	str += 7;
 
+	// WORKAROUND: Original game set wrong music name at the end of the introduction sequence
+	if (_scriptName == "prol80p" && music._nextSongName == "default")
+		music._nextSongName = "01cue90";
+
 	return RET_SUCCESS;
 }
 






More information about the Scummvm-git-logs mailing list