[Scummvm-git-logs] scummvm master -> 8b454a61abfb7d390d33117e5ced4448e562133e
dreammaster
dreammaster at scummvm.org
Thu Sep 1 05:18:39 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:
8b454a61ab TITANIC: Fix black flash at the start of view change clips
Commit: 8b454a61abfb7d390d33117e5ced4448e562133e
https://github.com/scummvm/scummvm/commit/8b454a61abfb7d390d33117e5ced4448e562133e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-08-31T23:18:33-04:00
Commit Message:
TITANIC: Fix black flash at the start of view change clips
Changed paths:
engines/titanic/game_state.h
engines/titanic/support/movie.cpp
diff --git a/engines/titanic/game_state.h b/engines/titanic/game_state.h
index 9ccf7b2..70d47b5 100644
--- a/engines/titanic/game_state.h
+++ b/engines/titanic/game_state.h
@@ -35,8 +35,7 @@ class CGameManager;
enum GameStateMode {
GSMODE_NONE = 0, GSMODE_INTERACTIVE = 1, GSMODE_CUTSCENE = 2,
- GSMODE_3 = 3, GSMODE_4 = 4, GSMODE_INSERT_CD = 5, GSMODE_CLIP = 6,
- GSMODE_PENDING_LOAD = 7
+ GSMODE_3 = 3, GSMODE_4 = 4, GSMODE_INSERT_CD = 5, GSMODE_PENDING_LOAD = 6
};
enum Season {
diff --git a/engines/titanic/support/movie.cpp b/engines/titanic/support/movie.cpp
index 647b24d..e863185 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() {
More information about the Scummvm-git-logs
mailing list