diff options
| author | Paul Gilbert | 2017-08-05 22:38:00 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-08-05 22:38:00 -0400 |
| commit | bbd9247eb8982af130021c2f44dc157eee4b282c (patch) | |
| tree | a9679ed7cd1835521d9b6902097c993e47988886 /engines | |
| parent | e29b2fc7310ed6c14c798c7c160a1bc91c15462c (diff) | |
| download | scummvm-rg350-bbd9247eb8982af130021c2f44dc157eee4b282c.tar.gz scummvm-rg350-bbd9247eb8982af130021c2f44dc157eee4b282c.tar.bz2 scummvm-rg350-bbd9247eb8982af130021c2f44dc157eee4b282c.zip | |
TITANIC: Maintain static movie frames on objects across saves
Diffstat (limited to 'engines')
| -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; } |