[Scummvm-git-logs] scummvm master -> feef98dd225e8c11032306b91c3ccf06ee6e3c5b

dreammaster dreammaster at scummvm.org
Sat Jul 1 23:48:09 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:
feef98dd22 TITANIC: Fix crash going up service elevator in prologue


Commit: feef98dd225e8c11032306b91c3ccf06ee6e3c5b
    https://github.com/scummvm/scummvm/commit/feef98dd225e8c11032306b91c3ccf06ee6e3c5b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-01T17:48:01-04:00

Commit Message:
TITANIC: Fix crash going up service elevator in prologue

Changed paths:
    engines/titanic/support/avi_surface.cpp


diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index 810c0ec5..5443301 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -138,12 +138,8 @@ bool AVISurface::startAtFrame(int frameNumber) {
 		// Default to starting frame of first movie range
 		frameNumber = _movieRangeInfo.front()->_startFrame;
 
-	if (frameNumber > _movieRangeInfo.front()->_endFrame) {
-		if (!isReversed())
-			setFrameRate(-DEFAULT_FPS);
-		if (frameNumber == (int)_decoder->getFrameCount())
-			--frameNumber;
-	}
+	if (frameNumber == (int)_decoder->getFrameCount())
+		--frameNumber;
 
 	// Start the playback
 	_decoder->start();





More information about the Scummvm-git-logs mailing list