aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2015-12-26 23:11:04 +0100
committerStrangerke2015-12-26 23:11:04 +0100
commit55f236f6ffd6dd253712c1cfc8cd60d09d03bff7 (patch)
tree62a5943fd95a02483426278938f1b510ecc72b89 /engines
parent90ac7a2bcb620eb29194eb94458f45d48e794c59 (diff)
downloadscummvm-rg350-55f236f6ffd6dd253712c1cfc8cd60d09d03bff7.tar.gz
scummvm-rg350-55f236f6ffd6dd253712c1cfc8cd60d09d03bff7.tar.bz2
scummvm-rg350-55f236f6ffd6dd253712c1cfc8cd60d09d03bff7.zip
LAB: Fix glitch when skipping intro
Diffstat (limited to 'engines')
-rw-r--r--engines/lab/intro.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp
index 8971c96786..537f129863 100644
--- a/engines/lab/intro.cpp
+++ b/engines/lab/intro.cpp
@@ -262,16 +262,13 @@ void Intro::play() {
_vm->_graphics->_fadePalette = palette;
for (int i = 0; i < 16; i++) {
- if (_quitIntro)
- break;
-
palette[i] = ((_vm->_anim->_diffPalette[i * 3] >> 2) << 8) +
((_vm->_anim->_diffPalette[i * 3 + 1] >> 2) << 4) +
(_vm->_anim->_diffPalette[i * 3 + 2] >> 2);
}
-
_vm->updateMusicAndEvents();
- _vm->_graphics->fade(true);
+ if (!_quitIntro)
+ _vm->_graphics->fade(true);
for (int times = 0; times < 150; times++) {
if (_quitIntro)
@@ -289,9 +286,11 @@ void Intro::play() {
_vm->waitTOF();
}
- _vm->_graphics->fade(false);
- _vm->_graphics->blackAllScreen();
- _vm->updateMusicAndEvents();
+ if (!_quitIntro) {
+ _vm->_graphics->fade(false);
+ _vm->_graphics->blackAllScreen();
+ _vm->updateMusicAndEvents();
+ }
nReadPict("Title.A");
nReadPict("AB");