aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorLe Philousophe2019-05-20 21:26:39 +0200
committerEugene Sandulenko2019-06-01 22:43:48 +0200
commitdae772f496c0eaa2df40b65292dddc850263f2cf (patch)
treeae136831590a9e8c3a6334dae0ffc1ff99297ae2 /engines
parent0e0cdbee245dba78d35fab497ba16489fc9e561f (diff)
downloadscummvm-rg350-dae772f496c0eaa2df40b65292dddc850263f2cf.tar.gz
scummvm-rg350-dae772f496c0eaa2df40b65292dddc850263f2cf.tar.bz2
scummvm-rg350-dae772f496c0eaa2df40b65292dddc850263f2cf.zip
CRYOMNI3D: Make sure toolbar is displayed on colored screen
If toolbar is triggered before warp first draw and after a FADE_PAL transition, screen stays black until user leaves toolbar (in blind).
Diffstat (limited to 'engines')
-rw-r--r--engines/cryomni3d/versailles/engine.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/cryomni3d/versailles/engine.cpp b/engines/cryomni3d/versailles/engine.cpp
index 4088749c9c..8401a78618 100644
--- a/engines/cryomni3d/versailles/engine.cpp
+++ b/engines/cryomni3d/versailles/engine.cpp
@@ -1208,6 +1208,12 @@ bool CryOmni3DEngine_Versailles::handleWarpMouse(unsigned int *actionId,
g_system->copyRectToScreen(original->getPixels(), original->pitch, 0, 0, original->w, original->h);
drawCountdown();
+ // Fade in palette to avoid displaying toolbar on a black screen
+ if (_fadedPalette) {
+ fadeInPalette(_mainPalette);
+ _fadedPalette = false;
+ }
+
bool mustRedraw = displayToolbar(original);
// Don't redraw if we abort game
if (_abortCommand != AbortNoAbort) {