[Scummvm-git-logs] scummvm master -> 107133c89fedd52c91196f7c15245b4a95b19b81

[AndywinXp]

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:
107133c89f SCUMM: v7-8: Fix setCameraAt() behavior when executed from checkExecVerbs()


Commit: 107133c89fedd52c91196f7c15245b4a95b19b81
    https://github.com/scummvm/scummvm/commit/107133c89fedd52c91196f7c15245b4a95b19b81
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-10-11T23:04:21+02:00

Commit Message:
SCUMM: v7-8: Fix setCameraAt() behavior when executed from checkExecVerbs()

Checking all the necessary disasms, the camera._last update
(and the sound as well...) should be executed before checkExecVerbs().
This successfully fixes #15398:
"SCUMM: DIG: Fast room skipping in first two screens produces glitches"

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 357f18bf976..efd20af588c 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2905,6 +2905,10 @@ load_game:
 			playActorSounds();
 	}
 
+	scummLoop_handleSound();
+
+	camera._last = camera._cur;
+
 	// It's verified from FT and DIG disasms that this is where
 	// these two functions should be called; this will delay the
 	// scripts executions between checkExecVerbs() and runAllScripts()
@@ -2914,10 +2918,6 @@ load_game:
 		checkExecVerbs();
 	}
 
-	scummLoop_handleSound();
-
-	camera._last = camera._cur;
-
 	_res->increaseExpireCounter();
 
 	if (!isUsingOriginalGUI() || ((_game.version >= 3) || !isPaused()))