[Scummvm-git-logs] scummvm master -> 6e6741af1f0c4ba201d693e0afb21a2c0df70c5c

[eriktorbjorn]

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

Summary:
db1fd7ddbb SCUMM: Fix missing cursor in Mac Indy 3 and Loom after loading
6e6741af1f NEWS: Mention Mac Indy3 / Loom cursor fix


Commit: db1fd7ddbbd02c1faded1845d5e75cb11a329b06
    https://github.com/scummvm/scummvm/commit/db1fd7ddbbd02c1faded1845d5e75cb11a329b06
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-01-24T16:08:48+01:00

Commit Message:
SCUMM: Fix missing cursor in Mac Indy 3 and Loom after loading

This was a regression that was apparently introduced when the animation
flag was cleared for the Mac cursor. The animation made the cursor show
up when loading older save games, but not new ones. That's why it went
unnoticed until now.

Changed paths:
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index aa91dfa3698..07fe38ee22f 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -1578,6 +1578,15 @@ void ScummEngine_v5::saveLoadWithSerializer(Common::Serializer &s) {
 		}
 	}
 
+	// Reset Mac cursors for Loom and Indy 3, otherwise the cursor will be
+	// invisible after loading.
+
+	if (s.isLoading() && _game.platform == Common::kPlatformMacintosh) {
+		if ((_game.id == GID_LOOM && !_macCursorFile.empty()) || (_game.id == GID_INDY3 && _macScreen)) {
+			setBuiltinCursor(0);
+		}
+	}
+
 	// Regenerate 16bit palette after loading.
 	// This avoids color issues when loading savegames that have been saved with a different ScummVM port
 	// that uses a different 16bit color mode than the ScummVM port which is currently used.


Commit: 6e6741af1f0c4ba201d693e0afb21a2c0df70c5c
    https://github.com/scummvm/scummvm/commit/6e6741af1f0c4ba201d693e0afb21a2c0df70c5c
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-01-24T16:11:11+01:00

Commit Message:
NEWS: Mention Mac Indy3 / Loom cursor fix

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 9fef90a0305..32f4f0e7274 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -57,6 +57,8 @@ For a more comprehensive changelog of the latest experimental code, see:
    - New Digital iMUSE engine.
    - Rewrote music player for Amiga versions of Indy3 and Loom in accordance
      to the original code.
+   - Fix missing cursor in the 16-color Macintosh versions of Loom and Indiana
+     Jones and the Last Crusade after loading a savegame.
 
  Sherlock:
    - Fixed slowdown in Serrated Scalpel intro when playing the game from a small