From bbd9247eb8982af130021c2f44dc157eee4b282c Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 5 Aug 2017 22:38:00 -0400
Subject: TITANIC: Maintain static movie frames on objects across saves

---
 engines/titanic/core/game_object.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'engines/titanic/core')

diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 5a55d247ee..d4457e7456 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;
 }
 
-- 
cgit v1.2.3