[Scummvm-git-logs] scummvm master -> 63bb10c758175155ae5838895e21afd65daf0608

[sev-]

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:
2ac76393d6 VIDEO: QTVR: Fix getPanAngles() calculations
63bb10c758 DIRECTOR: XTRAS: Fix nodeLeaveHandler calling


Commit: 2ac76393d6e5eaad45616ffa10c53d7526af89b3
    https://github.com/scummvm/scummvm/commit/2ac76393d6e5eaad45616ffa10c53d7526af89b3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-19T23:25:08+01:00

Commit Message:
VIDEO: QTVR: Fix getPanAngles() calculations

Changed paths:
    video/qtvr_decoder.cpp


diff --git a/video/qtvr_decoder.cpp b/video/qtvr_decoder.cpp
index 4aaf9fed678..9338e2b7189 100644
--- a/video/qtvr_decoder.cpp
+++ b/video/qtvr_decoder.cpp
@@ -944,8 +944,8 @@ Graphics::FloatPoint QuickTimeDecoder::getPanAngles(int16 x, int16 y) {
 
 	Graphics::FloatPoint res;
 
-	res.x = desc->_hPanStart + (desc->_hPanStart - desc->_hPanEnd) / (float)desc->_sceneSizeY * pos.x;
-	res.y = desc->_vPanTop + (desc->_vPanTop - desc->_vPanBottom) / (float)desc->_sceneSizeX * pos.y;
+	res.x = desc->_hPanStart + (desc->_hPanStart - desc->_hPanEnd) * (float)pos.x / (float)desc->_sceneSizeY;
+	res.y = desc->_vPanTop + (desc->_vPanBottom - desc->_vPanTop) * (float)pos.y / (float)desc->_sceneSizeX;
 
 	return res;
 }


Commit: 63bb10c758175155ae5838895e21afd65daf0608
    https://github.com/scummvm/scummvm/commit/63bb10c758175155ae5838895e21afd65daf0608
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-19T23:25:09+01:00

Commit Message:
DIRECTOR: XTRAS: Fix nodeLeaveHandler calling

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 7110acc6060..04b6e166747 100644
--- a/engines/director/lingo/xtras/qtvrxtra.cpp
+++ b/engines/director/lingo/xtras/qtvrxtra.cpp
@@ -492,9 +492,11 @@ void QtvrxtraXtra::m_QTVRMouseDown(int nargs) {
 				break;
 		}
 
-		if (node != 0 && me->_video->getCurrentNodeID() != node) {
-			if (!me->_nodeLeaveHandler.empty())
-				g_lingo->executeHandler(me->_nodeLeaveHandler);
+		if (me->_video->getCurrentNodeID() != node) {
+			if (!me->_nodeLeaveHandler.empty()) {
+				g_lingo->push(me->_video->getCurrentNodeID());
+				g_lingo->executeHandler(me->_nodeLeaveHandler, 1);
+			}
 
 			nodeChanged = true;
 		}