[Scummvm-git-logs] scummvm master -> 933900d05b727869aecb5c9150f6779fa410077f

[tnm23]

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:
933900d05b ZVISION: Fix crash when pulling monastery bell tower rope in Nemesis.


Commit: 933900d05b727869aecb5c9150f6779fa410077f
    https://github.com/scummvm/scummvm/commit/933900d05b727869aecb5c9150f6779fa410077f
Author: Thomas N McEwan (46427621+tnm23 at users.noreply.github.com)
Date: 2026-02-08T18:55:09Z

Commit Message:
ZVISION: Fix crash when pulling monastery bell tower rope in Nemesis.
Add debug message for HotMovControl::onMouseMove.

Changed paths:
    engines/zvision/scripting/controls/hotmov_control.cpp
    engines/zvision/scripting/controls/hotmov_control.h


diff --git a/engines/zvision/scripting/controls/hotmov_control.cpp b/engines/zvision/scripting/controls/hotmov_control.cpp
index 76ce894cf13..1c76e92872e 100644
--- a/engines/zvision/scripting/controls/hotmov_control.cpp
+++ b/engines/zvision/scripting/controls/hotmov_control.cpp
@@ -116,14 +116,16 @@ bool HotMovControl::process(uint32 deltaTimeInMillis) {
 }
 
 bool HotMovControl::onMouseMove(const Common::Point &screenSpacePos, const Common::Point &backgroundImageSpacePos) {
+	debugC(6, kDebugControl, "ZVision::HotMovControl::onMouseMove( (%d,%d), (%d,%d))", screenSpacePos.x, screenSpacePos.y, backgroundImageSpacePos.x, backgroundImageSpacePos.y);
 	if (_engine->getScriptManager()->getStateFlag(_key) & Puzzle::DISABLED)
 		return false;
-
 	if (!_animation)
 		return false;
-
 	if (_cycle < _cyclesCount) {
-		if (_frames[_animation->getCurFrame()].contains(backgroundImageSpacePos)) {
+		_frame = _animation->getCurFrame();
+		if(_frame < 0)
+			return false;
+		if (_frames[_frame].contains(backgroundImageSpacePos)) {
 			_engine->getCursorManager()->changeCursor(CursorIndex_Active);
 			return true;
 		}
diff --git a/engines/zvision/scripting/controls/hotmov_control.h b/engines/zvision/scripting/controls/hotmov_control.h
index ee2cb235299..4915242d23f 100644
--- a/engines/zvision/scripting/controls/hotmov_control.h
+++ b/engines/zvision/scripting/controls/hotmov_control.h
@@ -41,6 +41,7 @@ public:
 
 private:
 	int32  _framesCount;
+	int32  _frame;
 	int32  _cycle;
 	int32  _cyclesCount;
 	Video::VideoDecoder *_animation;