diff options
| author | Paul Gilbert | 2017-07-31 22:20:50 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-07-31 22:20:50 -0400 |
| commit | bc29ee474a4e95b91c6be3a33fd67de2a402a112 (patch) | |
| tree | 036a706f2cbf84553cfc84a8b3359466ac91e77b /engines/titanic/core | |
| parent | a42172485efb47638bd4cb27f7be8d32247a5605 (diff) | |
| download | scummvm-rg350-bc29ee474a4e95b91c6be3a33fd67de2a402a112.tar.gz scummvm-rg350-bc29ee474a4e95b91c6be3a33fd67de2a402a112.tar.bz2 scummvm-rg350-bc29ee474a4e95b91c6be3a33fd67de2a402a112.zip | |
TITANIC: Handle brief freeze if prologue credits are skipped
Diffstat (limited to 'engines/titanic/core')
| -rw-r--r-- | engines/titanic/core/game_object.cpp | 7 | ||||
| -rw-r--r-- | engines/titanic/core/game_object.h | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index 3619d56330..5a55d247ee 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -686,18 +686,21 @@ void CGameObject::playRandomClip(const char *const *names, uint flags) { playClip(name, flags); } -void CGameObject::playCutscene(uint startFrame, uint endFrame) { +bool CGameObject::playCutscene(uint startFrame, uint endFrame) { if (!_surface) { if (!_resource.empty()) loadResource(_resource); _resource.clear(); } + bool result = true; if (_surface && _surface->loadIfReady() && _surface->_movie) { disableMouse(); - _surface->_movie->playCutscene(_bounds, startFrame, endFrame); + result = _surface->_movie->playCutscene(_bounds, startFrame, endFrame); enableMouse(); } + + return result; } void CGameObject::savePosition() { diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index 0d2b8c976d..c09577a53f 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -393,8 +393,9 @@ protected: /** * Play a cutscene + * @returns True if the cutscene was not interrupted */ - void playCutscene(uint startFrame, uint endFrame); + bool playCutscene(uint startFrame, uint endFrame); /** * Play a clip randomly from a passed list of names |