[Scummvm-cvs-logs] scummvm master -> b6f84d37b3568d464ae5894c4035b9553a5d9263
bluegr
bluegr at gmail.com
Sat Feb 20 22:29:43 CET 2016
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:
b6f84d37b3 SCI: Fix showStyle check in palMorphFrameOut() - thanks snover
Commit: b6f84d37b3568d464ae5894c4035b9553a5d9263
https://github.com/scummvm/scummvm/commit/b6f84d37b3568d464ae5894c4035b9553a5d9263
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-02-20T23:28:41+02:00
Commit Message:
SCI: Fix showStyle check in palMorphFrameOut() - thanks snover
Changed paths:
engines/sci/graphics/frameout.cpp
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 6613b6b..38a7433 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!");
More information about the Scummvm-git-logs
mailing list