[Scummvm-git-logs] scummvm master -> 858467b39a253347cca015792d7fb7d01baa7e29

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
7d6b55d319 Revert "ZVISION: Don't use boolean variables for numeric operations"
858467b39a ZVISION: Use parentheses to clear out operator precedence


Commit: 7d6b55d319d92044b87483bdc2e0acdfc0193a8a
    https://github.com/scummvm/scummvm/commit/7d6b55d319d92044b87483bdc2e0acdfc0193a8a
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-10-22T01:14:22+03:00

Commit Message:
Revert "ZVISION: Don't use boolean variables for numeric operations"

This reverts commit ee7c4d234a9a36d825b1df17cc49e253c06732bb.

Changed paths:
    engines/zvision/scripting/script_manager.cpp


diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index e5d124fc152..b40f9ff39d7 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -104,8 +104,7 @@ void ScriptManager::process(uint deltaTimeMillis) {
 	// Another idea would be to change if there are pending scripts
 	// in the exec queues, but that could cause this to hang
 	// indefinitely.
-	const uint8 maxPass = changingLocation() ? 0 : 1;
-	for (uint8 pass = 0; pass <= maxPass ? _changeLocationExtraCycles : 0; pass++) {
+	for (uint8 pass = 0; pass <= changingLocation() ? _changeLocationExtraCycles : 0; pass++) {
 		updateNodes(pass == 0 ? deltaTimeMillis : 0);
 		debugC(5, kDebugLoop, "Script nodes updated");
 		if (!execScope(_nodeview))


Commit: 858467b39a253347cca015792d7fb7d01baa7e29
    https://github.com/scummvm/scummvm/commit/858467b39a253347cca015792d7fb7d01baa7e29
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-10-22T01:18:52+03:00

Commit Message:
ZVISION: Use parentheses to clear out operator precedence

Fixes MSVC warning C4804: '<=': unsafe use of type 'bool' in operation.
Thanks to @sluicebox for the suggested correction to my initial fix

Changed paths:
    engines/zvision/scripting/script_manager.cpp


diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index b40f9ff39d7..98b5d0700f6 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -104,7 +104,7 @@ void ScriptManager::process(uint deltaTimeMillis) {
 	// Another idea would be to change if there are pending scripts
 	// in the exec queues, but that could cause this to hang
 	// indefinitely.
-	for (uint8 pass = 0; pass <= changingLocation() ? _changeLocationExtraCycles : 0; pass++) {
+	for (uint8 pass = 0; pass <= (changingLocation() ? _changeLocationExtraCycles : 0); pass++) {
 		updateNodes(pass == 0 ? deltaTimeMillis : 0);
 		debugC(5, kDebugLoop, "Script nodes updated");
 		if (!execScope(_nodeview))