[Scummvm-git-logs] scummvm master -> 5d77ade10bd1274756cb4a226080eb7673c0b693

[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:
5d77ade10b TITANIC: Fix infinite Barbot animation loop after loading savegame


Commit: 5d77ade10bd1274756cb4a226080eb7673c0b693
    https://github.com/scummvm/scummvm/commit/5d77ade10bd1274756cb4a226080eb7673c0b693
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-09-07T21:04:04-07:00

Commit Message:
TITANIC: Fix infinite Barbot animation loop after loading savegame

Changed paths:
    NEWS
    engines/titanic/support/movie_range_info.cpp


diff --git a/NEWS b/NEWS
index d80f872..a58d2f2 100644
--- a/NEWS
+++ b/NEWS
@@ -63,6 +63,7 @@ For a more comprehensive changelog of the latest experimental code, see:
     - Fixed bug in entering floor numbers numerically that could crash the game.
     - Fixed parser not getting properly reset across sentences in a conversation.
     - Fixed endless busy cursor on Titania closeup when brain slots are incorrectly inserted.
+	- Fixed loading saves in front of Barbot could cause him to go into an infinite animation loop.
 
  Tucker:
    - Fixed multiple graphic issues in Bud Tucker in Double Trouble.
diff --git a/engines/titanic/support/movie_range_info.cpp b/engines/titanic/support/movie_range_info.cpp
index ddf4291..7b184c1 100644
--- a/engines/titanic/support/movie_range_info.cpp
+++ b/engines/titanic/support/movie_range_info.cpp
@@ -91,9 +91,9 @@ void CMovieRangeInfo::getMovieFrame(CMovieEventList &list, int frameNumber) {
 
 void CMovieRangeInfo::process(CGameObject *owner) {
 	int flags = 0;
-	if (_endFrame)
+	if (_isRepeat)
 		flags |= MOVIE_REPEAT;
-	if (_startFrame)
+	if (_isReversed)
 		flags |= MOVIE_REVERSE;
 
 	for (CMovieEventList::iterator i = _events.begin(); i != _events.end(); ++i) {