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

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


Commit: aeacf0820fa3c2f82920e5e8f00b240103f160af
    https://github.com/scummvm/scummvm/commit/aeacf0820fa3c2f82920e5e8f00b240103f160af
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-11-21T20:29:21+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 295aa150196..32fcf14a8f3 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -1537,7 +1537,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 {
@@ -1658,7 +1658,6 @@ void ScummEngine::saveLoadWithSerializer(Common::Serializer &s) {
 			x *= 2;
 			y *= 2;
 		} else if (_macScreen) {
-			y += _macScreenDrawOffset;
 			x *= 2;
 			y *= 2;
 		}