From b1cae872512a7dff969201b7c7b7633100b39415 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 31 May 2015 20:27:41 +0200
Subject: SHERLOCK: Fix brief black screen in EA logo intro

There used to be a slight delay between clearing the screen and
starting the "morph into EA logo" animation. Now those two things
are done in the same stage of the intro.
---
 engines/sherlock/scalpel/tsage/logo.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'engines/sherlock/scalpel/tsage')

diff --git a/engines/sherlock/scalpel/tsage/logo.cpp b/engines/sherlock/scalpel/tsage/logo.cpp
index 239543b017..3ae6476282 100644
--- a/engines/sherlock/scalpel/tsage/logo.cpp
+++ b/engines/sherlock/scalpel/tsage/logo.cpp
@@ -480,20 +480,18 @@ void Logo::nextFrame() {
 			// Fade out the background but keep the shapes visible
 			fade(_palette2);
 			screen._backBuffer1.clear();
-			screen.clear();
 		}
 		break;
 
-	case 13: {
+	case 14:
 		// Load the new palette
 		byte palette[PALETTE_SIZE];
 		Common::copy(&_palette2[0], &_palette2[PALETTE_SIZE], &palette[0]);
 		_lib.getPalette(palette, 12);
+		screen.clear();
 		screen.setPalette(palette);
-		break;
-	}
 
-	case 14:
+		// Morph into the EA logo
 		_objects[0].setVisage(12, 1);
 		_objects[0]._frame = 1;
 		_objects[0]._numFrames = 7;
-- 
cgit v1.2.3