[Scummvm-git-logs] scummvm master -> c26c17110048ef0a5790a6b88c7eb3f18a871d61

[sev-]

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

Summary:
c26c171100 DIRECTOR: XTRAS: Call Rollover handler at the beginning of MouseOver call in QTVR


Commit: c26c17110048ef0a5790a6b88c7eb3f18a871d61
    https://github.com/scummvm/scummvm/commit/c26c17110048ef0a5790a6b88c7eb3f18a871d61
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-15T22:03:31+01:00

Commit Message:
DIRECTOR: XTRAS: Call Rollover handler at the beginning of MouseOver call in QTVR

Changed paths:
    engines/director/lingo/xtras/qtvrxtra.cpp


diff --git a/engines/director/lingo/xtras/qtvrxtra.cpp b/engines/director/lingo/xtras/qtvrxtra.cpp
index 34799b6078e..654248c6ab1 100644
--- a/engines/director/lingo/xtras/qtvrxtra.cpp
+++ b/engines/director/lingo/xtras/qtvrxtra.cpp
@@ -436,6 +436,14 @@ void QtvrxtraXtra::m_QTVRMouseOver(int nargs) {
 		return;
 	}
 
+	// Execute handler on first call to MouseOver
+	const Common::QuickTimeParser::PanoHotSpot *hotspot = me->_video->getCurrentHotspot();
+
+	if (!me->_rolloverHotSpotHandler.empty()) {
+		g_lingo->push(hotspot ? hotspot->id : 0);
+		g_lingo->executeHandler(me->_rolloverHotSpotHandler, 1);
+	}
+
 	while (true) {
 		Graphics::Surface const *frame = me->_video->decodeNextFrame();
 
@@ -457,11 +465,11 @@ void QtvrxtraXtra::m_QTVRMouseOver(int nargs) {
 					break;
 			}
 
-			const Common::QuickTimeParser::PanoHotSpot *hotspot = me->_video->getCurrentHotspot();
+			hotspot = me->_video->getCurrentHotspot();
 
 			me->_widget->processEvent(event);
 
-			if (hotspot !=  me->_video->getCurrentHotspot()) {
+			if (!me->_rolloverHotSpotHandler.empty() && hotspot != me->_video->getCurrentHotspot()) {
 				g_lingo->push(hotspot ? hotspot->id : 0);
 
 				g_lingo->executeHandler(me->_rolloverHotSpotHandler, 1);