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

dreammaster dreammaster at scummvm.org
Sun Oct 15 03:59:37 CEST 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:
2d25ce2e5a TITANIC: Stop final piano note of music room music getting cut off


Commit: 2d25ce2e5af321e68d616b568795abfdcc9130ce
    https://github.com/scummvm/scummvm/commit/2d25ce2e5af321e68d616b568795abfdcc9130ce
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-10-14T21:59:20-04:00

Commit Message:
TITANIC: Stop final piano note of music room music getting cut off

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 b7d6ea1..3b66459 100644
--- a/engines/titanic/sound/music_room_handler.cpp
+++ b/engines/titanic/sound/music_room_handler.cpp
@@ -195,10 +195,12 @@ bool CMusicRoomHandler::update() {
 		_soundStartTicks = currentTicks;
 	}
 
-	updateAudio();
-	updateInstruments();
+	if (_instrumentsActive > 0) {
+		updateAudio();
+		updateInstruments();
+	}
 
-	return _instrumentsActive > 0;
+	return !_audioBuffer->isFinished();
 }
 
 void CMusicRoomHandler::updateAudio() {





More information about the Scummvm-git-logs mailing list