[Scummvm-cvs-logs] scummvm master -> 78b8fa31ca49aae2218fb0bdd20fda28b99b15a9

[digitall]

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:
78b8fa31ca CINE: Fix typo in OS palette restore code.


Commit: 78b8fa31ca49aae2218fb0bdd20fda28b99b15a9
    https://github.com/scummvm/scummvm/commit/78b8fa31ca49aae2218fb0bdd20fda28b99b15a9
Author: D G Turner (digitall at scummvm.org)
Date: 2012-08-11T13:12:35-07:00

Commit Message:
CINE: Fix typo in OS palette restore code.

This fixes most cases of incorrect palette on savegame loading.
Thanks to yaz0r for this fix.

Changed paths:
    engines/cine/gfx.cpp



diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp
index 742c660..8d73bae 100644
--- a/engines/cine/gfx.cpp
+++ b/engines/cine/gfx.cpp
@@ -839,7 +839,7 @@ void OSRenderer::restorePalette(Common::SeekableReadStream &fHandle, int version
 
 	fHandle.read(buf, kHighPalNumBytes);
 
-	if (colorCount == kHighPalNumBytes) {
+	if (colorCount == kHighPalNumColors) {
 		// Load the active 256 color palette from file
 		_activePal.load(buf, sizeof(buf), kHighPalFormat, kHighPalNumColors, CINE_LITTLE_ENDIAN);
 	} else {