[Scummvm-git-logs] scummvm branch-2-5 -> 30517b4981e2b964015171cdf9c8677727c324da

[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:
b99d0495ba SCUMM: Fix missing cursor in Mac Indy 3 and Loom after loading
30517b4981 NEWS: Mention Macintosh Indy 3 / Loom cursor fix


Commit: b99d0495bad259feb93afdb4c7e2c5e47018950d
    https://github.com/scummvm/scummvm/commit/b99d0495bad259feb93afdb4c7e2c5e47018950d
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-01-24T16:12:40+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 8ea688393d5..de30f205830 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -1580,6 +1580,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: 30517b4981e2b964015171cdf9c8677727c324da
    https://github.com/scummvm/scummvm/commit/30517b4981e2b964015171cdf9c8677727c324da
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-01-24T16:13:21+01:00

Commit Message:
NEWS: Mention Macintosh Indy 3 / Loom cursor fix

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 09f494aeff1..c1898fcd8e5 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,6 +3,11 @@ For a more comprehensive changelog of the latest experimental code, see:
 
 #### 2.5.2 (XXXX-XX-XX)
 
+ SCUMM:
+
+   - Fixed 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
      installation.