diff options
| author | Paul Gilbert | 2017-06-18 20:29:40 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-06-18 20:29:40 -0400 |
| commit | c92e1ec0f4afc3ebc8e021ce9fc2d8e897785791 (patch) | |
| tree | 063802e967f6edabe8223dc9acf708d6da41b932 /engines | |
| parent | fd51315dd07161e3e047f8d9aa2d529d7330f6b1 (diff) | |
| download | scummvm-rg350-c92e1ec0f4afc3ebc8e021ce9fc2d8e897785791.tar.gz scummvm-rg350-c92e1ec0f4afc3ebc8e021ce9fc2d8e897785791.tar.bz2 scummvm-rg350-c92e1ec0f4afc3ebc8e021ce9fc2d8e897785791.zip | |
TITANIC: Fix tearing/incorrect blocks in starship crash cutscene
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/titanic/game_manager.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/engines/titanic/game_manager.cpp b/engines/titanic/game_manager.cpp index ed6f56decb..d6cc7d14fc 100644 --- a/engines/titanic/game_manager.cpp +++ b/engines/titanic/game_manager.cpp @@ -130,8 +130,14 @@ void CGameManager::roomTransition(CRoomItem *oldRoom, CRoomItem *newRoom) { delete _movie; _movie = nullptr; - CResourceKey movieKey = (oldRoom == newRoom) ? oldRoom->getTransitionMovieKey() : - oldRoom->getExitMovieKey(); + CResourceKey movieKey; + if (newRoom == oldRoom) { + movieKey = oldRoom->getTransitionMovieKey(); + _movieRoom = oldRoom; + } else { + movieKey = oldRoom->getExitMovieKey(); + } + CString filename = movieKey.getFilename(); if (g_vm->_filesManager->fileExists(filename)) { _movieSurface->freeSurface(); |