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

[sev-]

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

Summary:
fc433589dd GRAPHICS: MACGUI: Wrap cursor masks in OSystem feature check


Commit: fc433589ddae6e355afa3d49eda1b35d2b0cddbd
    https://github.com/scummvm/scummvm/commit/fc433589ddae6e355afa3d49eda1b35d2b0cddbd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-09-29T11:11:32+02:00

Commit Message:
GRAPHICS: MACGUI: Wrap cursor masks in OSystem feature check

Currently, they are supported only by the OpenGL backend

Changed paths:
    graphics/macgui/macwindowmanager.cpp


diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index dc22e32f538..638b27d9fc7 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -1305,7 +1305,10 @@ void MacWindowManager::pushCursor(MacCursorType type, Cursor *cursor) {
 		CursorMan.pushCursorPalette(cursorPalette, 0, 2);
 		break;
 	case kMacCursorBeam:
-		CursorMan.pushCursor(macCursorBeam, 11, 16, 3, 8, 3, false, NULL, macCursorBeamMask);
+		if (g_system->getFeatureState(OSystem::kFeatureCursorMaskInvert))
+			CursorMan.replaceCursor(macCursorBeam, 11, 16, 3, 8, 3, false, NULL, macCursorBeamMask);
+		else
+			CursorMan.replaceCursor(macCursorBeam, 11, 16, 3, 8, 3);
 		CursorMan.pushCursorPalette(cursorPalette, 0, 2);
 		break;
 	case kMacCursorCrossHair:
@@ -1343,7 +1346,10 @@ void MacWindowManager::replaceCursor(MacCursorType type, Cursor *cursor) {
 		CursorMan.replaceCursorPalette(cursorPalette, 0, 2);
 		break;
 	case kMacCursorBeam:
-		CursorMan.replaceCursor(macCursorBeam, 11, 16, 3, 8, 3, false, NULL, macCursorBeamMask);
+		if (g_system->getFeatureState(OSystem::kFeatureCursorMaskInvert))
+			CursorMan.replaceCursor(macCursorBeam, 11, 16, 3, 8, 3, false, NULL, macCursorBeamMask);
+		else
+			CursorMan.replaceCursor(macCursorBeam, 11, 16, 3, 8, 3);
 		CursorMan.replaceCursorPalette(cursorPalette, 0, 2);
 		break;
 	case kMacCursorCrossHair: