[Scummvm-cvs-logs] scummvm master -> ba798e250d8e8abef2213425384fa81bec3ff5f6

[clone2727]

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:
ba798e250d SCI: Add support for slater mac


Commit: ba798e250d8e8abef2213425384fa81bec3ff5f6
    https://github.com/scummvm/scummvm/commit/ba798e250d8e8abef2213425384fa81bec3ff5f6
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-11-16T14:56:12-08:00

Commit Message:
SCI: Add support for slater mac

Changed paths:
    engines/sci/detection_tables.h
    engines/sci/graphics/view.cpp



diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 69f0afd..edb5008 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -3191,6 +3191,13 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 	 	Common::EN_ANY, Common::kPlatformPC, 0, GUIO1(GUIO_NOSPEECH)	},
 
+	// Slater & Charlie Go Camping - English Macintosh
+	{"slater", "", {
+		{"Data1", 0, "7243b4390e5f0182d8133fbcae4b50c5", 2298853},
+		{"Data2", 0, "6b6f18f9b502dc0923eeae0ef47f02d5", 2276956},
+		AD_LISTEND},
+	 	Common::EN_ANY, Common::kPlatformMacintosh, ADGF_MACRESFORK, GUIO1(GUIO_NONE)	},
+
 	// Space Quest 1 VGA Remake - English Amiga (from www.back2roots.org)
 	// SCI interpreter version 1.000.510 (just a guess)
 	{"sq1sci", "SCI", {
diff --git a/engines/sci/graphics/view.cpp b/engines/sci/graphics/view.cpp
index e095cde..a77bccc 100644
--- a/engines/sci/graphics/view.cpp
+++ b/engines/sci/graphics/view.cpp
@@ -432,10 +432,11 @@ void unpackCelData(byte *inBuffer, byte *celBitmap, byte clearColor, int pixelCo
 	//   Skip the next YYYYY pixels (i.e. transparency)
 
 	if (literalPos && isMacSci11ViewData) {
-		// KQ6/Freddy Pharkas use byte lengths, all others use uint16
+		// KQ6/Freddy Pharkas/Slater use byte lengths, all others use uint16
 		// The SCI devs must have realized that a max of 255 pixels wide
 		// was not very good for 320 or 640 width games.
-		bool hasByteLengths = (g_sci->getGameId() == GID_KQ6 || g_sci->getGameId() == GID_FREDDYPHARKAS);
+		bool hasByteLengths = (g_sci->getGameId() == GID_KQ6 || g_sci->getGameId() == GID_FREDDYPHARKAS
+				|| g_sci->getGameId() == GID_SLATER);
 
 		// compression for SCI1.1+ Mac
 		while (pixelNr < pixelCount) {