From 8b454a61abfb7d390d33117e5ced4448e562133e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 31 Aug 2016 23:18:33 -0400
Subject: TITANIC: Fix black flash at the start of view change clips

---
 engines/titanic/support/movie.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'engines/titanic/support')

diff --git a/engines/titanic/support/movie.cpp b/engines/titanic/support/movie.cpp
index 647b24dda4..e863185f84 100644
--- a/engines/titanic/support/movie.cpp
+++ b/engines/titanic/support/movie.cpp
@@ -133,13 +133,14 @@ void OSMovie::playCutscene(const Rect &drawRect, uint startFrame, uint endFrame)
 		drawRect.top + (heightLess ? CLIP_HEIGHT_REDUCED : CLIP_HEIGHT)
 	);
 
-	CGameState &gameState = g_vm->_window->_gameManager->_gameState;
-	gameState.setMode(GSMODE_CLIP);
+	// Set a new event target whilst the clip plays, so standard scene drawing isn't called
+	CEventTarget eventTarget;
+	g_vm->_events->addTarget(&eventTarget);
 
 	_aviSurface.setFrame(startFrame);
 	_aviSurface.playCutscene(r, startFrame, endFrame);
 
-	gameState.setMode(GSMODE_INTERACTIVE);
+	g_vm->_events->removeTarget();
 }
 
 void OSMovie::stop() {
-- 
cgit v1.2.3