[Scummvm-git-logs] scummvm master -> a7ea64280dd1b7dfb4d823e3d2b3a39aafb726c9

[sluicebox]

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:
a7ea64280d SCI: Handle HOYLE4 Mac palette endianness


Commit: a7ea64280dd1b7dfb4d823e3d2b3a39aafb726c9
    https://github.com/scummvm/scummvm/commit/a7ea64280dd1b7dfb4d823e3d2b3a39aafb726c9
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-10-16T01:05:43-05:00

Commit Message:
SCI: Handle HOYLE4 Mac palette endianness

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


diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 21772b8a6f..d8b2f93cb9 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -159,14 +159,20 @@ void GfxPalette::createFromData(const SciSpan<const byte> &data, Palette *palett
 		// SCI0/SCI1 palette
 		palFormat = SCI_PAL_FORMAT_VARIABLE; // CONSTANT;
 		palOffset = 260;
-		palColorStart = 0; palColorCount = 256;
-		//memcpy(&paletteOut->mapping, data, 256);
+		palColorStart = 0;
+		palColorCount = 256;
 	} else {
 		// SCI1.1 palette
 		palFormat = data[32];
 		palOffset = 37;
 		palColorStart = data[25];
-		palColorCount = data.getUint16SEAt(29);
+		if (g_sci->getGameId() != GID_HOYLE4) {
+			palColorCount = data.getUint16SEAt(29);
+		} else {
+			// HOYLE4's SCI1.1 palettes are little endian even in
+			// the Mac version, unlike every other SCI1.1 Mac game.
+			palColorCount = data.getUint16LEAt(29);
+		}
 	}
 
 	switch (palFormat) {