[Scummvm-git-logs] scummvm master -> 772df430946fb3733c8ff615ce4143f07bc85879

AndywinXp noreply at scummvm.org
Sun Oct 8 18:03:36 UTC 2023


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:
772df43094 SCUMM: Fix post load fixes for v3 games


Commit: 772df430946fb3733c8ff615ce4143f07bc85879
    https://github.com/scummvm/scummvm/commit/772df430946fb3733c8ff615ce4143f07bc85879
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-10-08T20:03:29+02:00

Commit Message:
SCUMM: Fix post load fixes for v3 games

This prevents higher than 1 values for _userPut and
_cursor.state on reload.

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 0577b9b78d0..b5334bd80e2 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2983,11 +2983,11 @@ void ScummEngine_v3::terminateSaveMenuScript() {
 		}
 
 		// Show the cursor
-		_cursor.state++;
+		_cursor.state = 1;
 		verbMouseOver(0);
 
 		// Enable user interaction
-		_userPut++;
+		_userPut = 1;
 
 		// Stop code for all the objects in the save screen
 		stopObjectCode();
@@ -3059,11 +3059,11 @@ void ScummEngine_v3::terminateSaveMenuScript() {
 		}
 
 		// Show the cursor
-		_cursor.state++;
+		_cursor.state = 1;
 		verbMouseOver(0);
 
 		// Enable user interaction
-		_userPut++;
+		_userPut = 1;
 
 		// Stop code for all the objects in the save screen
 		stopObjectCode();
@@ -3118,11 +3118,11 @@ void ScummEngine_v3::terminateSaveMenuScript() {
 		}
 
 		// Show the cursor
-		_cursor.state++;
+		_cursor.state = 1;
 		verbMouseOver(0);
 
 		// Enable user interaction
-		_userPut++;
+		_userPut = 1;
 
 		// Chain script 5 (or 6 for FM-Towns)
 		int chainedArgs[NUM_SCRIPT_LOCAL];




More information about the Scummvm-git-logs mailing list