[Scummvm-git-logs] scummvm master -> 0f01d699b9a4b746a96c139174811d6d831c5add

[sev-]

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

Summary:
5850a98841 VIDEO: QTVR: Reset rollover hotspot fully
909af07511 DIRECTOR: XLIBS: Improved hotspot callback handling
0f01d699b9 DIRECTOR: XLIBS: Fix methods table <facepalm>


Commit: 5850a98841adaa5e82d03432dde79bc390ef9f07
    https://github.com/scummvm/scummvm/commit/5850a98841adaa5e82d03432dde79bc390ef9f07
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-24T11:47:48+01:00

Commit Message:
VIDEO: QTVR: Reset rollover hotspot fully

Changed paths:
    video/qtvr_decoder.cpp


diff --git a/video/qtvr_decoder.cpp b/video/qtvr_decoder.cpp
index eb75c49982e..6e4a80797c7 100644
--- a/video/qtvr_decoder.cpp
+++ b/video/qtvr_decoder.cpp
@@ -960,6 +960,7 @@ void QuickTimeDecoder::lookupHotspot(int16 x, int16 y) {
 
 	if (hotspotPoint.x < 0) {
 		_rolloverHotspot = nullptr;
+		_rolloverHotspotID = 0;
 	} else {
 		int hotspotId = (int)(((PanoTrackHandler *)getTrack(_panoTrack->targetTrack))->_constructedHotspots->getPixel(hotspotPoint.y, hotspotPoint.x));
 


Commit: 909af07511230d9190b0c20e4617fca21f1cda8f
    https://github.com/scummvm/scummvm/commit/909af07511230d9190b0c20e4617fca21f1cda8f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-24T11:47:48+01:00

Commit Message:
DIRECTOR: XLIBS: Improved hotspot callback handling

Changed paths:
    engines/director/lingo/xlibs/qtvr.cpp


diff --git a/engines/director/lingo/xlibs/qtvr.cpp b/engines/director/lingo/xlibs/qtvr.cpp
index 727b422ec58..587b3660dd6 100644
--- a/engines/director/lingo/xlibs/qtvr.cpp
+++ b/engines/director/lingo/xlibs/qtvr.cpp
@@ -224,7 +224,6 @@ void QTVR::m_mouseOver(int nargs) {
 			}
 
 			node = me->_video->getCurrentNodeID();
-			hotspot = me->_video->getRolloverHotspotID();
 
 			if (event.type == Common::EVENT_LBUTTONUP) {
 				me->_widget->processEvent(event);
@@ -248,10 +247,12 @@ void QTVR::m_mouseOver(int nargs) {
 				return;
 			}
 
+			hotspot = me->_video->getRolloverHotspotID();
+
 			me->_widget->processEvent(event);
 
-			if (!me->_rolloverCallbackMethod.empty()) {
-				g_lingo->push(hotspot);
+			if (hotspot != me->_video->getRolloverHotspotID() && !me->_rolloverCallbackMethod.empty()) {
+				g_lingo->push(me->_video->getRolloverHotspotID());
 				g_lingo->push(me->_rolloverCallbackObject);
 				LC::call(me->_rolloverCallbackMethod, 2, false);
 			}


Commit: 0f01d699b9a4b746a96c139174811d6d831c5add
    https://github.com/scummvm/scummvm/commit/0f01d699b9a4b746a96c139174811d6d831c5add
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-24T11:47:48+01:00

Commit Message:
DIRECTOR: XLIBS: Fix methods table <facepalm>

Changed paths:
    engines/director/lingo/xlibs/qtvr.cpp


diff --git a/engines/director/lingo/xlibs/qtvr.cpp b/engines/director/lingo/xlibs/qtvr.cpp
index 587b3660dd6..2ca175f7b30 100644
--- a/engines/director/lingo/xlibs/qtvr.cpp
+++ b/engines/director/lingo/xlibs/qtvr.cpp
@@ -86,7 +86,7 @@ static const MethodProto xlibMethods[] = {
 	{ "setHPanAngle",			QTVR::m_setHPanAngle,			1, 1,	400 },	// D4
 	{ "setNodeID",				QTVR::m_setNodeID,				1, 1,	400 },	// D4
 	{ "setQuality",				QTVR::m_setQuality,				1, 1,	400 },	// D4
-	{ "setRolloverCallback",	QTVR::m_setQuality,				2, 2,	400 },	// D4
+	{ "setRolloverCallback",	QTVR::m_setRolloverCallback,	2, 2,	400 },	// D4
 	{ "setTransitionMode",		QTVR::m_setTransitionMode,		1, 1,	400 },	// D4
 	{ "setTransitionSpeed",		QTVR::m_setTransitionSpeed,		1, 1,	400 },	// D4
 	{ "setVPanAngle",			QTVR::m_setVPanAngle,			1, 1,	400 },	// D4