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

[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:
bbd9247eb8 TITANIC: Maintain static movie frames on objects across saves


Commit: bbd9247eb8982af130021c2f44dc157eee4b282c
    https://github.com/scummvm/scummvm/commit/bbd9247eb8982af130021c2f44dc157eee4b282c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-05T22:38:00-04:00

Commit Message:
TITANIC: Maintain static movie frames on objects across saves

Changed paths:
    engines/titanic/core/game_object.cpp


diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 5a55d24..d4457e7 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -736,6 +736,11 @@ bool CGameObject::hasActiveMovie() const {
 int CGameObject::getMovieFrame() const {
 	if (_surface && _surface->_movie)
 		return _surface->_movie->getFrame();
+	else if (_frameNumber > 0)
+		// WORKAROUND: If an object has a pending frame to be set to,
+		// but the movie hasn't yet been loaded, return that frame
+		return _frameNumber;
+
 	return _initialFrame;
 }