diff options
Diffstat (limited to 'engines/titanic/core/game_object.cpp')
| -rw-r--r-- | engines/titanic/core/game_object.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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; } |