[Scummvm-cvs-logs] scummvm master -> 55f236f6ffd6dd253712c1cfc8cd60d09d03bff7

[Strangerke]

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:
55f236f6ff LAB: Fix glitch when skipping intro


Commit: 55f236f6ffd6dd253712c1cfc8cd60d09d03bff7
    https://github.com/scummvm/scummvm/commit/55f236f6ffd6dd253712c1cfc8cd60d09d03bff7
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-12-26T23:11:04+01:00

Commit Message:
LAB: Fix glitch when skipping intro

Changed paths:
    engines/lab/intro.cpp



diff --git a/engines/lab/intro.cpp b/engines/lab/intro.cpp
index 8971c96..537f129 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");