[Scummvm-git-logs] scummvm branch-2-9 -> 05d2e52c6df0fd2aee4ec4d5aa0945baa6db1e52

[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:
05d2e52c6d SCUMM: Save mouse position for Mac GUI games, still ignore it on load


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

Commit Message:
SCUMM: Save mouse position for Mac GUI games, still ignore it on load

In case someone saves the game with the Mac GUI enabled, then loads it
without. Also, don't add _macScreenDrawOffset since that causes the
cursor to jump when loading the game with the Mac GUI. Maybe we
shouldn't warp the cursor at all, but this way it shouldn't make any
difference, I guess.

Changed paths:
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 6f3281c38c0..ba03388a1d0 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -1528,7 +1528,7 @@ void ScummEngine::saveLoadWithSerializer(Common::Serializer &s) {
 
 	// Don't restore the mouse position when using
 	// the original GUI, since the originals didn't
-	if (isUsingOriginalGUI()) {
+	if (s.isLoading() && isUsingOriginalGUI()) {
 		s.skip(2);
 		s.skip(2);
 	} else {
@@ -1649,7 +1649,6 @@ void ScummEngine::saveLoadWithSerializer(Common::Serializer &s) {
 			x *= 2;
 			y *= 2;
 		} else if (_macScreen) {
-			y += _macScreenDrawOffset;
 			x *= 2;
 			y *= 2;
 		}