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

[eriktorbjorn]

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:
d30acbc619 SCUMM: Extend the fix for bug #15520 to cover all v5 Mac games


Commit: d30acbc6191a8a4cc5c7c37d67612b53bc3f160e
    https://github.com/scummvm/scummvm/commit/d30acbc6191a8a4cc5c7c37d67612b53bc3f160e
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-11-21T20:43:22+01:00

Commit Message:
SCUMM: Extend the fix for bug #15520 to cover all v5 Mac games

The previous change fixed the problem for me in MI1, but I would still
see it in MI2 and Fate of Atlantis.

Changed paths:
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 32fcf14a8f3..487b7cd6270 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -2172,7 +2172,7 @@ void ScummEngine_v5::saveLoadWithSerializer(Common::Serializer &s) {
 
 		// Also reset Mac cursors if the original GUI isn't enabled for games
 		// which replace cursors that override the default cursor palette - bug #15520.
-		if (_game.id == GID_MONKEY && !_macGui) {
+		if (_game.version == 5 && !_macGui) {
 			setBuiltinCursor(0);
 		}
 	}