[Scummvm-cvs-logs] scummvm master -> 5917467c1b3faa97ec5a7b95eeface6d097cda77

[csnover]

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:
5917467c1b SCI32: Fix incorrect double-read from CLUT


Commit: 5917467c1b3faa97ec5a7b95eeface6d097cda77
    https://github.com/scummvm/scummvm/commit/5917467c1b3faa97ec5a7b95eeface6d097cda77
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-03-18T09:14:53-05:00

Commit Message:
SCI32: Fix incorrect double-read from CLUT

Changed paths:
    engines/sci/graphics/frameout.cpp



diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 82a33e4..b654cbf 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -1017,7 +1017,10 @@ void GfxFrameout::alterVmap(const Palette &palette1, const Palette &palette2, co
 		int8 styleRangeValue = styleRanges[currentValue];
 		if (styleRangeValue == -1 && styleRangeValue == style) {
 			currentValue = pixels[pixelIndex] = clut[currentValue];
-			styleRangeValue = styleRanges[clut[currentValue]];
+			// NOTE: In original engine this assignment happens outside of the
+			// condition, but if the branch is not followed the value is just
+			// going to be the same as it was before
+			styleRangeValue = styleRanges[currentValue];
 		}
 
 		if (