[Scummvm-git-logs] scummvm master -> 2c8d72afd70d9cb40daafec5d3b2947ba33fe2e2

dreammaster dreammaster at scummvm.org
Mon Feb 13 00:08:59 CET 2017


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:
2c8d72afd7 TITANIC: Fix ticks change check in updateInstruments


Commit: 2c8d72afd70d9cb40daafec5d3b2947ba33fe2e2
    https://github.com/scummvm/scummvm/commit/2c8d72afd70d9cb40daafec5d3b2947ba33fe2e2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-12T18:08:51-05:00

Commit Message:
TITANIC: Fix ticks change check in updateInstruments

Changed paths:
    engines/titanic/sound/music_room_handler.cpp


diff --git a/engines/titanic/sound/music_room_handler.cpp b/engines/titanic/sound/music_room_handler.cpp
index b5adbae..df2bc54 100644
--- a/engines/titanic/sound/music_room_handler.cpp
+++ b/engines/titanic/sound/music_room_handler.cpp
@@ -243,7 +243,7 @@ void CMusicRoomHandler::updateInstruments() {
 				instrument = (MusicInstrument)((int)instrument + 1)) {
 			MusicRoomInstrument &ins1 = _array1[instrument];
 			MusicRoomInstrument &ins2 = _array2[instrument];
-			CMusicRoomInstrument *musicWave = _instruments[instrument];
+			CMusicRoomInstrument *ins = _instruments[instrument];
 
 			// Is this about checking playback position?
 			if (_position[instrument] < 0 || ins1._muteControl || _position[instrument] >= _musicObjs[instrument]->size()) {
@@ -254,7 +254,7 @@ void CMusicRoomHandler::updateInstruments() {
 			uint ticks = g_vm->_events->getTicksCount() - _soundStartTicks;
 			double val = (double)ticks * 0.001 - 0.6;
 
-			if (val >= musicWave->_floatVal) {
+			if (val >= (ins->_floatVal - _array5[instrument])) {
 				_array5[instrument] += fn3(instrument, _position[instrument]);
 
 				const CValuePair &vp = (*_musicObjs[instrument])[_position[instrument]];





More information about the Scummvm-git-logs mailing list