aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/scalpel/tsage
diff options
context:
space:
mode:
authorTorbjörn Andersson2015-05-31 20:27:41 +0200
committerTorbjörn Andersson2015-05-31 20:27:41 +0200
commitb1cae872512a7dff969201b7c7b7633100b39415 (patch)
tree8f1b3c9fedcb03fa5b0f4ac87d8f91915b9a15d4 /engines/sherlock/scalpel/tsage
parent141ff4d08dc24b6bb17098bd71801e2a58e6a38f (diff)
downloadscummvm-rg350-b1cae872512a7dff969201b7c7b7633100b39415.tar.gz
scummvm-rg350-b1cae872512a7dff969201b7c7b7633100b39415.tar.bz2
scummvm-rg350-b1cae872512a7dff969201b7c7b7633100b39415.zip
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.
Diffstat (limited to 'engines/sherlock/scalpel/tsage')
-rw-r--r--engines/sherlock/scalpel/tsage/logo.cpp8
1 files changed, 3 insertions, 5 deletions
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;