[Scummvm-git-logs] scummvm master -> c92e1ec0f4afc3ebc8e021ce9fc2d8e897785791

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c92e1ec0f4 TITANIC: Fix tearing/incorrect blocks in starship crash cutscene


Commit: c92e1ec0f4afc3ebc8e021ce9fc2d8e897785791
    https://github.com/scummvm/scummvm/commit/c92e1ec0f4afc3ebc8e021ce9fc2d8e897785791
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-18T20:29:40-04:00

Commit Message:
TITANIC: Fix tearing/incorrect blocks in starship crash cutscene

Changed paths:
    engines/titanic/game_manager.cpp


diff --git a/engines/titanic/game_manager.cpp b/engines/titanic/game_manager.cpp
index ed6f56d..d6cc7d1 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();