mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-13 12:39:56 +00:00
Moved the initial screen clearing from play() to load(), so that it will be
done before the MPEG player calls showOverlay(). svn-id: r23482
This commit is contained in:
parent
6eecad5722
commit
cd020a688e
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user