[Scummvm-git-logs] scummvm master -> 8a024a2ea33879f7d93c1419009d2cf73c2ce66c

[antoniou79]

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

Summary:
8a024a2ea3 MYST3: Keep camera locked for LookAt command


Commit: 8a024a2ea33879f7d93c1419009d2cf73c2ce66c
    https://github.com/scummvm/scummvm/commit/8a024a2ea33879f7d93c1419009d2cf73c2ce66c
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2026-05-11T13:39:49+03:00

Commit Message:
MYST3: Keep camera locked for LookAt command

Complementary fix for #16758

Previous fix was https://github.com/scummvm/scummvm/commit/5a5ae3e39be8f8ed5397572c0609d6ca3503392a

This additional fix keeps camera locked while the bridge is extending. The camera is later freed by a subsequent script command.

Changed paths:
    engines/myst3/myst3.cpp
    engines/myst3/script.cpp


diff --git a/engines/myst3/myst3.cpp b/engines/myst3/myst3.cpp
index e0fe658545b..2b8d866ace9 100644
--- a/engines/myst3/myst3.cpp
+++ b/engines/myst3/myst3.cpp
@@ -1529,8 +1529,8 @@ void Myst3Engine::dragSymbol(uint16 var, uint16 id) {
 	HotSpot *hovered = getHoveredHotspot(nodeData, var);
 	if (hovered) {
 		_cursor->setVisible(false);
-		// enable free camera movement after placing the symbol on the pedestal
-		// fix for bug #16758
+		// Enable free camera movement after placing the symbol on the imaging/scanner table.
+		// Part of fix for #16758
 		_cursor->lockPosition(true);
 		_scriptEngine->run(&hovered->script);
 		_cursor->setVisible(true);
diff --git a/engines/myst3/script.cpp b/engines/myst3/script.cpp
index 86399959ae4..3fd15267671 100644
--- a/engines/myst3/script.cpp
+++ b/engines/myst3/script.cpp
@@ -2246,6 +2246,10 @@ void Script::moviePlayChangeNodeTrans(Context &c, const Opcode &cmd) {
 void Script::lookAt(Context &c, const Opcode &cmd) {
 	debugC(kDebugScript, "Opcode %d: Look at %d, %d", cmd.op, cmd.args[0], cmd.args[1]);
 
+	// Lock camera until another script command (cameraFreeMovement) frees it.
+	// Part of fix for #16758 - locks camera while the J'nanin observatory bridge
+	// is extending towards the Narayan book pedestal.
+	_vm->_cursor->lockPosition(false);
 	_vm->animateDirectionChange(cmd.args[0], cmd.args[1], 0);
 }