[Scummvm-cvs-logs] scummvm master -> 8841aee2f129e09d45ff5ce38b74877a55ffb5ae

[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:
8841aee2f1 SHERLOCK: RT: Fix Diogenes fire music slightly too long in intro


Commit: 8841aee2f129e09d45ff5ce38b74877a55ffb5ae
    https://github.com/scummvm/scummvm/commit/8841aee2f129e09d45ff5ce38b74877a55ffb5ae
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-10-17T15:24:29-04:00

Commit Message:
SHERLOCK: RT: Fix Diogenes fire music slightly too long in intro

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



diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index 2f4e852..27f3766 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -90,15 +90,22 @@ bool TattooScene::loadScene(const Common::String &filename) {
 		}
 	}
 
-	// Set the NPC paths for the scene
-	setNPCPath(WATSON);
-
 	// Handle loading music for the scene
 	if (talk._scriptMoreFlag != 1 && talk._scriptMoreFlag != 3)
 		music._nextSongName = Common::String::format("res%02d", _currentScene);
 
+	// Set the NPC paths for the scene
+	setNPCPath(WATSON);
+
 	// If it's a new song, then start it up
 	if (music._currentSongName.compareToIgnoreCase(music._nextSongName)) {
+		// WORKAROUND: Stop playing music after Diogenes fire scene in the intro, 
+		// since it overlaps slightly into the next scene
+		if (talk._scriptName == "prol80p" && _currentScene == 80) {
+			music.stopMusic();
+			events.wait(5);
+		}
+
 		if (music.loadSong(music._nextSongName)) {
 			if (music._musicOn)
 				music.startSong();