aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2016-02-20 23:28:00 +0200
committerFilippos Karapetis2016-02-20 23:28:41 +0200
commitb6f84d37b3568d464ae5894c4035b9553a5d9263 (patch)
treef4eb0260754900b1d6bae97ba7dbf217bc6d28e4 /engines
parent3d97d2f0ed0c0608e74cdb430a5672645f70eb6f (diff)
downloadscummvm-rg350-b6f84d37b3568d464ae5894c4035b9553a5d9263.tar.gz
scummvm-rg350-b6f84d37b3568d464ae5894c4035b9553a5d9263.tar.bz2
scummvm-rg350-b6f84d37b3568d464ae5894c4035b9553a5d9263.zip
SCI: Fix showStyle check in palMorphFrameOut() - thanks snover
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/graphics/frameout.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 6613b6b88c..38a7433783 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -772,7 +772,7 @@ void GfxFrameout::palMorphFrameOut(const int8 *styleRanges, const ShowStyleEntry
_palette->updateHardware();
alterVmap(nextPalette, sourcePalette, 1, _styleRanges);
- if (showStyle->type > 0 && showStyle->type < 15) {
+ if (showStyle && showStyle->type != kShowStyleUnknown) {
// TODO: SCI2.1mid transition effects
// processEffects();
warning("Transition not implemented!");