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

[m-kiewitz]

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:
fb90140bee AGI: Use special Apple IIgs SQ1 palette for SQ1


Commit: fb90140beeaf60440dd1dc2ad0dcfca79968f92b
    https://github.com/scummvm/scummvm/commit/fb90140beeaf60440dd1dc2ad0dcfca79968f92b
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-09T22:58:28+01:00

Commit Message:
AGI: Use special Apple IIgs SQ1 palette for SQ1

Was already documented inside palette.h, but wasn't used yet

Changed paths:
    engines/agi/graphics.cpp
    engines/agi/palette.h



diff --git a/engines/agi/graphics.cpp b/engines/agi/graphics.cpp
index ba5895c..06f9285 100644
--- a/engines/agi/graphics.cpp
+++ b/engines/agi/graphics.cpp
@@ -87,7 +87,16 @@ int GfxMgr::initVideo() {
 		}
 		break;
 	case Common::kRenderApple2GS:
-		initPalette(_paletteGfxMode, PALETTE_APPLE_II_GS, 16, 4);
+		switch (_vm->getGameID()) {
+		case GID_SQ1:
+			// Special one, only used for Space Quest 1 on Apple IIgs. Is the same as Amiga v1 palette
+			initPalette(_paletteGfxMode, PALETTE_APPLE_II_GS_SQ1, 16, 4);
+			break;
+		default:
+			// Regular "standard" Apple IIgs palette, used by everything else
+			initPalette(_paletteGfxMode, PALETTE_APPLE_II_GS, 16, 4);
+			break;
+		}
 		break;
 	case Common::kRenderAtariST:
 		initPalette(_paletteGfxMode, PALETTE_ATARI_ST, 16, 3);
diff --git a/engines/agi/palette.h b/engines/agi/palette.h
index f66582b..e0db81e 100644
--- a/engines/agi/palette.h
+++ b/engines/agi/palette.h
@@ -122,6 +122,9 @@ static const uint8 PALETTE_APPLE_II_GS[16 * 3] = {
 	0xF, 0xF, 0xF
 };
 
+// Re-use Amiga v1 palette for Apple IIgs Space Quest 1
+#define PALETTE_APPLE_II_GS_SQ1 PALETTE_AMIGA_V1
+
 /**
  * First generation Amiga & Apple IIGS AGI palette.
  * A 16-color, 12-bit RGB palette.