From cd020a688ed445dc67cd9f1c70a90f6c890d9af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20Andersson?= Date: Mon, 10 Jul 2006 18:57:40 +0000 Subject: [PATCH] Moved the initial screen clearing from play() to load(), so that it will be done before the MPEG player calls showOverlay(). svn-id: r23482 --- engines/sword2/animation.cpp | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp index fd6a2b0b5ed..b7a712fe54b 100644 --- a/engines/sword2/animation.cpp +++ b/engines/sword2/animation.cpp @@ -257,6 +257,19 @@ bool MoviePlayer::load(const char *name, MovieTextObject *text[]) { _numFrames = _movies[i].frames; if (_numFrames > 60) _leadOutFrame = _numFrames - 60; + + // Not all cutscenes cover the entire screen, so clear + // it. We will always clear the game screen, no matter + // how the cutscene is to be displayed. (We have to do + // this before showing the overlay.) + + _vm->_mouse->closeMenuImmediately(); + + if (!_seamless) { + _vm->_screen->clearScene(); + } + + _vm->_screen->updateDisplay(); return true; } } @@ -290,18 +303,6 @@ void MoviePlayer::play(int32 leadIn, int32 leadOut) { savePalette(); - // Not all cutscenes cover the entire screen, so clear it. We will - // always clear the game screen, no matter how the cutscene is to be - // displayed. - - _vm->_mouse->closeMenuImmediately(); - - if (!_seamless) { - _vm->_screen->clearScene(); - } - - _vm->_screen->updateDisplay(); - #ifndef SCUMM_BIG_ENDIAN flags |= Audio::Mixer::FLAG_LITTLE_ENDIAN; #endif