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

[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:
b7469085b5 TITANIC: Fix not being able to leave chicken dispensor


Commit: b7469085b596e3d2fc330fe23ec60c76116c2ed7
    https://github.com/scummvm/scummvm/commit/b7469085b596e3d2fc330fe23ec60c76116c2ed7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-12T08:12:49-05:00

Commit Message:
TITANIC: Fix not being able to leave chicken dispensor

Changed paths:
    engines/titanic/game/chicken_dispensor.cpp
    engines/titanic/support/avi_surface.cpp
    engines/titanic/support/movie.cpp



diff --git a/engines/titanic/game/chicken_dispensor.cpp b/engines/titanic/game/chicken_dispensor.cpp
index 8e02a1e..df1f1eb 100644
--- a/engines/titanic/game/chicken_dispensor.cpp
+++ b/engines/titanic/game/chicken_dispensor.cpp
@@ -178,7 +178,7 @@ bool CChickenDispensor::MouseDragStartMsg(CMouseDragStartMsg *msg) {
 }
 
 bool CChickenDispensor::TurnOff(CTurnOff *msg) {
-	if (getMovieFrame() == 16)
+	if (getMovieFrame() != 16)
 		setVisible(false);
 	playMovie(16, 12, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
 	_fieldE8 = 0;
diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index 525c651..3619823 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -175,7 +175,7 @@ bool AVISurface::handleEvents(CMovieEventList &events) {
 			delete info;
 
 			if (_movieRangeInfo.empty()) {
-				// NO more ranges, so stop playback
+				// No more ranges, so stop playback
 				stop();
 			} else {
 				// Not empty, so move onto new first one
diff --git a/engines/titanic/support/movie.cpp b/engines/titanic/support/movie.cpp
index 949ed62..1bdcdee 100644
--- a/engines/titanic/support/movie.cpp
+++ b/engines/titanic/support/movie.cpp
@@ -164,17 +164,15 @@ bool OSMovie::handleEvents(CMovieEventList &events) {
 
 	if (!_aviSurface.isPlaying())
 		return false;
-	if (!_aviSurface.isNextFrame())
-		return _aviSurface.isPlaying();
 
 	// Handle updating the frame
 	while (_aviSurface.isPlaying() && _aviSurface.isNextFrame()) {
 		_aviSurface.handleEvents(events);
 		_videoSurface->setTransparencySurface(_aviSurface.getSecondarySurface());
-	}
 
-	// Flag there's a video frame
-	_hasVideoFrame = true;
+		// Flag there's a video frame
+		_hasVideoFrame = true;
+	}
 
 	return _aviSurface.isPlaying();
 }