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

[AndywinXp]

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:
b0abcd0461 SCUMM: MANIAC (Apple IIgs): Fix all known gfx regressions


Commit: b0abcd0461f2819612914cb5e32450830304465a
    https://github.com/scummvm/scummvm/commit/b0abcd0461f2819612914cb5e32450830304465a
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-08-10T21:52:36+02:00

Commit Message:
SCUMM: MANIAC (Apple IIgs): Fix all known gfx regressions

Poor Apple II version, it has been broken for at least a couple
of years :-)

All regressions were a byproduct of basically forgetting this
version existed when making changes which should have
(or should not have) targeted C64 games, which use the
same rendering routines and palettes as this one.

Fixes and closes #14765:
"SCUMM V0: MANIAC: APPLE II: Palette is incorrect."

Changed paths:
    engines/scumm/cursor.cpp
    engines/scumm/gfx.cpp
    engines/scumm/gfx_gui.cpp
    engines/scumm/palette.cpp
    engines/scumm/verbs.cpp


diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp
index b82ebb1d07b..80aa561fde7 100644
--- a/engines/scumm/cursor.cpp
+++ b/engines/scumm/cursor.cpp
@@ -782,7 +782,7 @@ void ScummEngine_v2::setBuiltinCursor(int idx) {
 
 	memset(_grabbedCursor, 0xFF, sizeof(_grabbedCursor));
 
-	if (_game.platform == Common::kPlatformC64)
+	if (_game.platform == Common::kPlatformC64 || _game.platform == Common::kPlatformApple2GS)
 		color = default_v0_cursor_colors[idx];
 	else if (_renderMode == Common::kRenderCGA || _renderMode == Common::kRenderCGAComp)
 		color = (idx & 1) * 3;
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index fd72cb5063f..59a808a1450 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -1894,8 +1894,8 @@ void ScummEngine_v5::drawFlashlight() {
 
 	blit(_flashlight.buffer, vs->pitch, bgbak, vs->pitch, _flashlight.w, _flashlight.h, vs->format.bytesPerPixel);
 
-	// C64 & NES does not round the flashlight
-	if (_game.platform != Common::kPlatformC64 && _game.platform != Common::kPlatformNES) {
+	// Apple IIGS, C64 & NES does not round the flashlight
+	if (_game.platform != Common::kPlatformApple2GS && _game.platform != Common::kPlatformC64 && _game.platform != Common::kPlatformNES) {
 		// Round the corners. Different versions have different rounding parameters.
 		if (vs->format.bytesPerPixel == 1) {
 			int width, height, heightLoc;
diff --git a/engines/scumm/gfx_gui.cpp b/engines/scumm/gfx_gui.cpp
index 4210000c092..d03abec50e9 100644
--- a/engines/scumm/gfx_gui.cpp
+++ b/engines/scumm/gfx_gui.cpp
@@ -342,7 +342,7 @@ Common::KeyState ScummEngine::printMessageAndPause(const char *msg, int color, i
 		if (_game.platform == Common::kPlatformNES) {
 			_string[2].xpos = 16;
 			_string[2].color = 0;
-		} else if (_game.platform == Common::kPlatformC64) {
+		} else if (_game.platform == Common::kPlatformC64 || _game.platform == Common::kPlatformApple2GS) {
 			_string[2].color = 16;
 		} else {
 			_string[2].color = 13;
diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp
index d18c325f4ed..abc47074fe1 100644
--- a/engines/scumm/palette.cpp
+++ b/engines/scumm/palette.cpp
@@ -478,7 +478,7 @@ void ScummEngine::setV1ColorTable(int renderMode) {
 		{	0x00, 0x0F, 0x08, 0x05, 0x0A, 0x05, 0x01, 0x0D, 0x0A, 0x02, 0x0A, 0x0C, 0x0F, 0x0A, 0x05, 0x0C }
 	};
 
-	int tbl = (_game.platform == Common::kPlatformC64) ? 0 : (_game.id == GID_ZAK ? 1 : 3);
+	int tbl = (_game.platform == Common::kPlatformC64 || _game.platform == Common::kPlatformApple2GS) ? 0 : (_game.id == GID_ZAK ? 1 : 3);
 	if (renderMode == Common::kRenderHercA || renderMode == Common::kRenderHercG || renderMode == Common::kRenderCGA || renderMode == Common::kRenderCGA_BW)
 		++tbl;
 
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index dde84f14796..3e96899250d 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -202,7 +202,7 @@ void ScummEngine_v2::initV2MouseOver() {
 	else if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG || _renderMode == Common::kRenderCGA_BW)
 		_hiLiteColorVerbArrow = _hiLiteColorInvSentence = 15;
 
-	if (_game.platform == Common::kPlatformC64) {
+	if (_game.platform == Common::kPlatformC64 || _game.platform == Common::kPlatformApple2GS) {
 		color = 16;
 		_hiLiteColorVerbArrow = _hiLiteColorInvSentence = 7;
 		arrow_color = 6;