[Scummvm-git-logs] scummvm master -> 468ac071db386ee4b711258b0342a16ffcc85100

[elasota]

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

Summary:
1477cb8f4c VCRUISE: Fix circuit puzzle highlights showing up after failing
468ac071db VCRUISE: Fix pointer cursor not showing if the mouse is moved over an open link while a barrier is animating


Commit: 1477cb8f4c4ac72c260abcf9c5c3cd152594aff0
    https://github.com/scummvm/scummvm/commit/1477cb8f4c4ac72c260abcf9c5c3cd152594aff0
Author: elasota (ejlasota at gmail.com)
Date: 2023-05-27T20:26:27-04:00

Commit Message:
VCRUISE: Fix circuit puzzle highlights showing up after failing

Changed paths:
    engines/vcruise/runtime_scriptexec.cpp


diff --git a/engines/vcruise/runtime_scriptexec.cpp b/engines/vcruise/runtime_scriptexec.cpp
index c000f6f2283..7583843b2c0 100644
--- a/engines/vcruise/runtime_scriptexec.cpp
+++ b/engines/vcruise/runtime_scriptexec.cpp
@@ -1928,6 +1928,8 @@ void Runtime::scriptOpPuzzleInit(ScriptArg_t arg) {
 	_circuitPuzzleConnectAnimation = animDef1;
 	_circuitPuzzleBlockAnimation = animDef2;
 
+	_idleIsOnOpenCircuitPuzzleLink = false;
+
 	_scriptEnv.puzzleWasSet = true;
 
 	if (firstMover == 2)
@@ -1935,7 +1937,7 @@ void Runtime::scriptOpPuzzleInit(ScriptArg_t arg) {
 }
 
 void Runtime::scriptOpPuzzleWhoWon(ScriptArg_t arg) {
-	StackInt_t winner = 0;
+	StackInt_t winner = 2;
 	if (_circuitPuzzle) {
 		switch (_circuitPuzzle->checkConclusion()) {
 		case CircuitPuzzle::kConclusionNone:
@@ -1946,6 +1948,9 @@ void Runtime::scriptOpPuzzleWhoWon(ScriptArg_t arg) {
 			break;
 		case CircuitPuzzle::kConclusionPlayerLost:
 			winner = 2;
+
+			// Clear puzzle so circuit highlights stop appearing
+			_circuitPuzzle.reset();
 			break;
 		default:
 			error("Unhandled puzzle conclusion");


Commit: 468ac071db386ee4b711258b0342a16ffcc85100
    https://github.com/scummvm/scummvm/commit/468ac071db386ee4b711258b0342a16ffcc85100
Author: elasota (ejlasota at gmail.com)
Date: 2023-05-27T20:26:27-04:00

Commit Message:
VCRUISE: Fix pointer cursor not showing if the mouse is moved over an open link while a barrier is animating

Changed paths:
    engines/vcruise/runtime_scriptexec.cpp


diff --git a/engines/vcruise/runtime_scriptexec.cpp b/engines/vcruise/runtime_scriptexec.cpp
index 7583843b2c0..b1587f70b29 100644
--- a/engines/vcruise/runtime_scriptexec.cpp
+++ b/engines/vcruise/runtime_scriptexec.cpp
@@ -1996,6 +1996,9 @@ void Runtime::scriptOpPuzzleDoMove1(ScriptArg_t arg) {
 	_idleIsOnOpenCircuitPuzzleLink = false;
 
 	changeToCursor(_cursors[kCursorArrow]);
+
+	// Return to idle so the mouse changes to the correct cursor if it's moved over a new link while waiting for the animation
+	_havePendingReturnToIdleState = true;
 }
 
 void Runtime::scriptOpPuzzleDoMove2(ScriptArg_t arg) {