diff options
Diffstat (limited to 'engines/sherlock/tattoo')
-rw-r--r-- | engines/sherlock/tattoo/tattoo_map.cpp | 1 | ||||
-rw-r--r-- | engines/sherlock/tattoo/tattoo_scene.cpp | 1 | ||||
-rw-r--r-- | engines/sherlock/tattoo/widget_options.cpp | 7 |
3 files changed, 3 insertions, 6 deletions
diff --git a/engines/sherlock/tattoo/tattoo_map.cpp b/engines/sherlock/tattoo/tattoo_map.cpp index 53a366b319..95858aef26 100644 --- a/engines/sherlock/tattoo/tattoo_map.cpp +++ b/engines/sherlock/tattoo/tattoo_map.cpp @@ -81,7 +81,6 @@ int TattooMap::show() { song = "Cue7"; if (music.loadSong(song)) { - music.setMIDIVolume(music._musicVolume); if (music._musicOn) music.startSong(); } diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp index 9c76df0b51..78100ebd99 100644 --- a/engines/sherlock/tattoo/tattoo_scene.cpp +++ b/engines/sherlock/tattoo/tattoo_scene.cpp @@ -94,7 +94,6 @@ bool TattooScene::loadScene(const Common::String &filename) { // If it's a new song, then start it up if (music._currentSongName.compareToIgnoreCase(music._nextSongName)) { if (music.loadSong(music._nextSongName)) { - music.setMIDIVolume(music._musicVolume); if (music._musicOn) music.startSong(); } diff --git a/engines/sherlock/tattoo/widget_options.cpp b/engines/sherlock/tattoo/widget_options.cpp index 574f6a896f..5dc6fc55b9 100644 --- a/engines/sherlock/tattoo/widget_options.cpp +++ b/engines/sherlock/tattoo/widget_options.cpp @@ -112,10 +112,9 @@ void WidgetOptions::handleEvents() { if (_midiSliderX > _bounds.width() - _surface.widestChar()) _midiSliderX = _bounds.width() - _surface.widestChar(); - int temp = music._musicVolume; - music._musicVolume = (_midiSliderX - _surface.widestChar()) * 255 / (_bounds.width() - _surface.widestChar() * 2); - if (music._musicVolume != temp) { - music.setMIDIVolume(music._musicVolume); + int newVolume = (_midiSliderX - _surface.widestChar()) * 255 / (_bounds.width() - _surface.widestChar() * 2); + if (newVolume != music._musicVolume) { + music.setMusicVolume(newVolume); vm.saveConfig(); } |