[Scummvm-git-logs] scummvm master -> 574dd030d260a7ef8797f8d9d7528a3eec93cb6b

[neuromancer]

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:
574dd030d2 FREESCAPE: better support for CGA color/stipple patterns


Commit: 574dd030d260a7ef8797f8d9d7528a3eec93cb6b
    https://github.com/scummvm/scummvm/commit/574dd030d260a7ef8797f8d9d7528a3eec93cb6b
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2025-01-20T14:12:08+01:00

Commit Message:
FREESCAPE: better support for CGA color/stipple patterns

Changed paths:
    engines/freescape/games/dark/dos.cpp
    engines/freescape/gfx.cpp


diff --git a/engines/freescape/games/dark/dos.cpp b/engines/freescape/games/dark/dos.cpp
index 877bf9d3164..fb3e1fcf256 100644
--- a/engines/freescape/games/dark/dos.cpp
+++ b/engines/freescape/games/dark/dos.cpp
@@ -38,9 +38,9 @@ byte kDarkCGAPalettePinkBlue[4][3] = {
 
 byte kDarkCGAPaletteRedGreen[4][3] = {
 	{0x00, 0x00, 0x00},
-	{0xaa, 0x55, 0x00},
-	{0xaa, 0x00, 0x00},
 	{0x00, 0xaa, 0x00},
+	{0xaa, 0x00, 0x00},
+	{0xaa, 0x55, 0x00},
 };
 
 static const CGAPaletteEntry rawCGAPaletteByArea[] {
diff --git a/engines/freescape/gfx.cpp b/engines/freescape/gfx.cpp
index 2be9d668b78..c4699bc353b 100644
--- a/engines/freescape/gfx.cpp
+++ b/engines/freescape/gfx.cpp
@@ -283,15 +283,6 @@ bool Renderer::getRGBAtCGA(uint8 index, uint8 &r1, uint8 &g1, uint8 &b1, uint8 &
 		return false;
 
 	assert (_renderMode == Common::kRenderCGA);
-	if (index <= 4) { // Solid colors
-		stipple = nullptr;
-		readFromPalette(index - 1, r1, g1, b1);
-		r2 = r1;
-		g2 = g1;
-		b2 = b1;
-		return true;
-	}
-
 	stipple = (byte *)_stipples[index - 1];
 	byte pair = _colorPair[index - 1];
 	byte c1 = pair & 0xf;