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

[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:
baf6b58313 TITANIC: Fix chicken dispensor


Commit: baf6b58313d74ea0fad8c321b1ae88bccb8a63da
    https://github.com/scummvm/scummvm/commit/baf6b58313d74ea0fad8c321b1ae88bccb8a63da
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-15T10:11:40-05:00

Commit Message:
TITANIC: Fix chicken dispensor

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


diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index 2cff894..2c56c01 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -156,7 +156,7 @@ void AVISurface::seekToFrame(uint frameNumber) {
 
 	if ((int)frameNumber != getFrame()) {
 		_decoder->seekToFrame(frameNumber);
-		_currentFrame = (int)frameNumber;
+		_currentFrame = _priorFrame = (int)frameNumber;
 	}
 }
 
@@ -169,6 +169,7 @@ bool AVISurface::handleEvents(CMovieEventList &events) {
 		return true;
 
 	CMovieRangeInfo *info = _movieRangeInfo.front();
+	_priorFrame = _currentFrame;
 	_currentFrame += _isReversed ? -1 : 1;
 
 	int newFrame = _currentFrame;
diff --git a/engines/titanic/support/avi_surface.h b/engines/titanic/support/avi_surface.h
index 4ee6cc6..099a257 100644
--- a/engines/titanic/support/avi_surface.h
+++ b/engines/titanic/support/avi_surface.h
@@ -65,7 +65,7 @@ private:
 	Graphics::ManagedSurface *_movieFrameSurface[2];
 	Graphics::ManagedSurface *_framePixels;
 	bool _isReversed;
-	int _currentFrame;
+	int _currentFrame, _priorFrame;
 	uint32 _priorFrameTime;
 	Common::String _movieName;
 private:
@@ -176,7 +176,7 @@ public:
 	/**
 	 * Gets the current frame
 	 */
-	int getFrame() const { return _currentFrame; }
+	int getFrame() const { return _priorFrame; }
 
 	/**
 	 * Add a movie event