[Scummvm-git-logs] scummvm master -> 4e04492a3ea7646d5276a8b91a543bc5241156f4

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
30cf097e0a AGOS: PN Amiga - Add Amiga info and hand cursors.
4e04492a3e AGOS: PN Amiga - Cursor code cleanup


Commit: 30cf097e0a3f059c3669dd44288e36e5ab285be6
    https://github.com/scummvm/scummvm/commit/30cf097e0a3f059c3669dd44288e36e5ab285be6
Author: Robert Megone (robert.megone at gmail.com)
Date: 2026-03-20T03:59:24+02:00

Commit Message:
AGOS: PN Amiga - Add Amiga info and hand cursors.

Changed paths:
    engines/agos/cursor.cpp


diff --git a/engines/agos/cursor.cpp b/engines/agos/cursor.cpp
index 2833f26c91f..157c89a7443 100644
--- a/engines/agos/cursor.cpp
+++ b/engines/agos/cursor.cpp
@@ -128,6 +128,50 @@ static const uint16 _common_moveLeft[32] = {
 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
 };
 
+static const byte _amiga_mousePalettePN[] = {
+	0x00, 0x00, 0x00,
+	0xDE, 0x20, 0x21,
+	0xFF, 0xCF, 0xAD
+};
+
+static const byte _amiga_mouseInfo[16 * 16] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x00, 0x01, 0x01, 0x01, 0x02, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x02, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0x00, 0x00, 0xFF, 0x00, 0x01, 0x01, 0x02, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x01, 0x01, 0x02, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x01, 0x01, 0x02, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+static const byte _amiga_handInfo[16 * 16] = {
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x02, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0x00, 0x02, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF,
+	0xFF, 0xFF, 0x00, 0xFF, 0x01, 0x02, 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xFF, 0x00, 0xFF,
+	0xFF, 0xFF, 0xFF, 0x00, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xFF, 0x00, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF
+};
+
 static const byte _simon2_cursors[10][256] = {
 	// cross hair
 	{ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xec,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
@@ -814,6 +858,24 @@ void AGOSEngine::drawMousePointer() {
 	if (getGameType() == GType_SIMON2) {
 		CursorMan.replaceCursor(_simon2_cursors[_mouseCursor], 16, 16, 7, 7, 0xFF);
 	} else if (getGameType() != GType_SIMON1) {
+		if (getGameType() == GType_PN && getPlatform() == Common::kPlatformAmiga) {
+			const byte *cursor = _amiga_mouseInfo;
+
+			if (_dragFlag) {
+				cursor = _amiga_handInfo;
+			} else if (_mouseCursor == 0) {
+				cursor = _amiga_mouseInfo;
+			} else if (_mouseCursor == 1) {
+				cursor = _amiga_mouseInfo;
+			} else {
+				cursor = _amiga_mouseInfo;
+			}
+
+			CursorMan.replaceCursorPalette(_amiga_mousePalettePN, 0, ARRAYSIZE(_amiga_mousePalettePN) / 3);
+			CursorMan.replaceCursor(cursor, 16, 16, 0, 0, 0xFF);
+			return;
+		}
+
 		const uint16 *src;
 		int i, j;
 
@@ -867,8 +929,9 @@ void AGOSEngine::drawMousePointer() {
 			}
 		}
 
-		if (_dragFlag)
+		if (_dragFlag) {
 			src = _common_handInfo;
+		}
 
 		for (i = 0; i < 16; i++) {
 			for (j = 0; j < 16; j++) {


Commit: 4e04492a3ea7646d5276a8b91a543bc5241156f4
    https://github.com/scummvm/scummvm/commit/4e04492a3ea7646d5276a8b91a543bc5241156f4
Author: Robert Megone (robert.megone at gmail.com)
Date: 2026-03-20T03:59:24+02:00

Commit Message:
AGOS: PN Amiga - Cursor code cleanup

Co-authored-by: Filippos Karapetis <bluegr at gmail.com>

Changed paths:
    engines/agos/cursor.cpp


diff --git a/engines/agos/cursor.cpp b/engines/agos/cursor.cpp
index 157c89a7443..7dc6eec8ff5 100644
--- a/engines/agos/cursor.cpp
+++ b/engines/agos/cursor.cpp
@@ -863,10 +863,6 @@ void AGOSEngine::drawMousePointer() {
 
 			if (_dragFlag) {
 				cursor = _amiga_handInfo;
-			} else if (_mouseCursor == 0) {
-				cursor = _amiga_mouseInfo;
-			} else if (_mouseCursor == 1) {
-				cursor = _amiga_mouseInfo;
 			} else {
 				cursor = _amiga_mouseInfo;
 			}