[Scummvm-git-logs] scummvm master -> 59d6feb9f89be24ffe27d24cc07c463dc7bfded0

dreammaster dreammaster at scummvm.org
Mon Feb 13 05:06:19 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:
59d6feb9f8 TITANIC: Fix threshold testing for instrument animations


Commit: 59d6feb9f89be24ffe27d24cc07c463dc7bfded0
    https://github.com/scummvm/scummvm/commit/59d6feb9f89be24ffe27d24cc07c463dc7bfded0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-12T23:06:13-05:00

Commit Message:
TITANIC: Fix threshold testing for instrument animations

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 fca1fd5..76d7043 100644
--- a/engines/titanic/sound/music_room_handler.cpp
+++ b/engines/titanic/sound/music_room_handler.cpp
@@ -253,8 +253,9 @@ void CMusicRoomHandler::updateInstruments() {
 
 			uint ticks = g_vm->_events->getTicksCount() - _soundStartTicks;
 			double time = (double)ticks * 0.001 - 0.6;
+			double threshold = _animTime[instrument] - ins->_animTime;
 
-			if (time >= (ins->_animTime - _animTime[instrument])) {
+			if (time >= threshold) {
 				_animTime[instrument] += getAnimDuration(instrument, _position[instrument]);
 
 				const CValuePair &vp = (*_songs[instrument])[_position[instrument]];





More information about the Scummvm-git-logs mailing list