[Scummvm-cvs-logs] scummvm master -> c583294edeee8470c0ed965d8e7b357073f8560b
dreammaster
dreammaster at scummvm.org
Sat Oct 17 20:09:19 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:
c583294ede SHERLOCK: RT: Fix setting new scene's music filename when music is off
Commit: c583294edeee8470c0ed965d8e7b357073f8560b
https://github.com/scummvm/scummvm/commit/c583294edeee8470c0ed965d8e7b357073f8560b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-10-17T14:08:44-04:00
Commit Message:
SHERLOCK: RT: Fix setting new scene's music filename when music is off
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 96c7764..2f4e852 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -94,16 +94,14 @@ bool TattooScene::loadScene(const Common::String &filename) {
setNPCPath(WATSON);
// Handle loading music for the scene
- if (music._musicOn) {
- if (talk._scriptMoreFlag != 1 && talk._scriptMoreFlag != 3)
- music._nextSongName = Common::String::format("res%02d", _currentScene);
-
- // If it's a new song, then start it up
- if (music._currentSongName.compareToIgnoreCase(music._nextSongName)) {
- if (music.loadSong(music._nextSongName)) {
- if (music._musicOn)
- music.startSong();
- }
+ if (talk._scriptMoreFlag != 1 && talk._scriptMoreFlag != 3)
+ music._nextSongName = Common::String::format("res%02d", _currentScene);
+
+ // If it's a new song, then start it up
+ if (music._currentSongName.compareToIgnoreCase(music._nextSongName)) {
+ if (music.loadSong(music._nextSongName)) {
+ if (music._musicOn)
+ music.startSong();
}
}
More information about the Scummvm-git-logs
mailing list