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

dreammaster dreammaster at scummvm.org
Sat Oct 29 04:50:33 CEST 2016


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:
a6477a8606 TITANIC: Fix room transition cutscenes


Commit: a6477a8606d9b250744e0fba7ddaa81cc206729b
    https://github.com/scummvm/scummvm/commit/a6477a8606d9b250744e0fba7ddaa81cc206729b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-28T22:50:30-04:00

Commit Message:
TITANIC: Fix room transition cutscenes

Changed paths:
    engines/titanic/game_state.cpp



diff --git a/engines/titanic/game_state.cpp b/engines/titanic/game_state.cpp
index 51c1ea4..bebc2ed 100644
--- a/engines/titanic/game_state.cpp
+++ b/engines/titanic/game_state.cpp
@@ -139,7 +139,7 @@ void CGameState::changeView(CViewItem *newView, CMovieClip *clip) {
 	} else {
 		oldView->preEnterView(newView);
 		_gameManager->_gameView->setView(newView);
-		CRoomItem *oldRoom = newView->findNode()->findRoom();
+		CRoomItem *oldRoom = oldView->findNode()->findRoom();
 		CRoomItem *newRoom = newView->findNode()->findRoom();
 
 		// If a transition clip is defined, play it





More information about the Scummvm-git-logs mailing list