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

[dreammaster]

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:
a2b05b5c63 TITANIC: Fix Doorbot doubletake in the prologue


Commit: a2b05b5c6302e8755448de66124fb9be81eee942
    https://github.com/scummvm/scummvm/commit/a2b05b5c6302e8755448de66124fb9be81eee942
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-03T20:09:23-04:00

Commit Message:
TITANIC: Fix Doorbot doubletake in the 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 a7d6ef5..bddbb98 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -205,7 +205,14 @@ bool AVISurface::handleEvents(CMovieEventList &events) {
 				// Not empty, so move onto new first one
 				info = _movieRangeInfo.front();
 				newFrame = info->_startFrame;
-				setFrameRate(info->_endFrame < info->_startFrame ? -DEFAULT_FPS : DEFAULT_FPS);
+				bool reversed = info->_endFrame < info->_startFrame;
+
+				if (isReversed() != reversed)
+					// Direction is different, so force frame seek below
+					_priorFrame = -1;
+
+				// Set the next clip's direction
+				setFrameRate(reversed ? -DEFAULT_FPS : DEFAULT_FPS);
 			}
 		}
 	}