thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TITANIC: Maintain static movie frames on objects across saves

Browse source
This commit is contained in:
Paul Gilbert 2017-08-05 22:38:00 -04:00
parent e29b2fc731
commit bbd9247eb8
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/titanic/core/game_object.cpp
View file

@ -736,6 +736,11 @@ bool CGameObject::hasActiveMovie() const {
int CGameObject::getMovieFrame() const { int CGameObject::getMovieFrame() const {
if (_surface && _surface->_movie) if (_surface && _surface->_movie)
return _surface->_movie->getFrame(); 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; return _initialFrame;
} }