[Scummvm-git-logs] scummvm master -> 42064d592a23ffd3bbc0cc741a5143113e2491ac

[sev-]

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

Summary:
fbce8607b0 Revert "QDENGINE: Simulate RBUTTON as ALT+LBUTTON"
42064d592a QDENGINE: Simplified simulating right click in the engine


Commit: fbce8607b08c3736b670f1f6064bb650fcc5d2d8
    https://github.com/scummvm/scummvm/commit/fbce8607b08c3736b670f1f6064bb650fcc5d2d8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-06-08T18:13:06+02:00

Commit Message:
Revert "QDENGINE: Simulate RBUTTON as ALT+LBUTTON"

This reverts commit 0fdfeb74a2853234657f4626e5474599e5a256e7.

Changed paths:
    engines/qdengine/minigames/adv/RunTime.cpp


diff --git a/engines/qdengine/minigames/adv/RunTime.cpp b/engines/qdengine/minigames/adv/RunTime.cpp
index 8dc23dfaa1b..479aa01ae3d 100644
--- a/engines/qdengine/minigames/adv/RunTime.cpp
+++ b/engines/qdengine/minigames/adv/RunTime.cpp
@@ -721,16 +721,8 @@ const char *MinigameManager::parameter(const char *name, const char *def) const
 }
 
 bool MinigameManager::mouseLeftPressed() const {
-	if (_invertMouseButtons) {
-		if (keyPressed(VK_LMENU)) {
-			return _engine->is_mouse_event_active(qdEngineInterface::MOUSE_EV_LEFT_DOWN);
-		}
+	if (_invertMouseButtons)
 		return _engine->is_mouse_event_active(qdEngineInterface::MOUSE_EV_RIGHT_DOWN);
-	}
-
-	if (keyPressed(VK_LMENU))
-		return false;
-
 	return _engine->is_mouse_event_active(qdEngineInterface::MOUSE_EV_LEFT_DOWN);
 
 }
@@ -738,10 +730,6 @@ bool MinigameManager::mouseLeftPressed() const {
 bool MinigameManager::mouseRightPressed() const {
 	if (_invertMouseButtons)
 		return _engine->is_mouse_event_active(qdEngineInterface::MOUSE_EV_LEFT_DOWN);
-
-	if (keyPressed(VK_LMENU)) {
-		return _engine->is_mouse_event_active(qdEngineInterface::MOUSE_EV_LEFT_DOWN);
-	}
 	return _engine->is_mouse_event_active(qdEngineInterface::MOUSE_EV_RIGHT_DOWN);
 
 }


Commit: 42064d592a23ffd3bbc0cc741a5143113e2491ac
    https://github.com/scummvm/scummvm/commit/42064d592a23ffd3bbc0cc741a5143113e2491ac
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-06-08T18:13:06+02:00

Commit Message:
QDENGINE: Simplified simulating right click in the engine

Changed paths:
    engines/qdengine/system/input/input_wndproc.cpp


diff --git a/engines/qdengine/system/input/input_wndproc.cpp b/engines/qdengine/system/input/input_wndproc.cpp
index c27bb1fb4a0..87870741b0a 100644
--- a/engines/qdengine/system/input/input_wndproc.cpp
+++ b/engines/qdengine/system/input/input_wndproc.cpp
@@ -56,7 +56,10 @@ bool mouse_wndproc(const Common::Event &event, mouseDispatcher *dsp) {
 	case Common::EVENT_LBUTTONDOWN:
 		x = event.mouse.x;
 		y = event.mouse.y;
-		dsp->handle_event(mouseDispatcher::EV_LEFT_DOWN, x, y, 0);
+		if (keyboardDispatcher::instance()->is_pressed(VK_LMENU))
+			dsp->handle_event(mouseDispatcher::EV_RIGHT_DOWN, x, y, 0);
+		else
+			dsp->handle_event(mouseDispatcher::EV_LEFT_DOWN, x, y, 0);
 		return true;
 	case Common::EVENT_RBUTTONDOWN:
 		x = event.mouse.x;
@@ -66,7 +69,10 @@ bool mouse_wndproc(const Common::Event &event, mouseDispatcher *dsp) {
 	case Common::EVENT_LBUTTONUP:
 		x = event.mouse.x;
 		y = event.mouse.y;
-		dsp->handle_event(mouseDispatcher::EV_LEFT_UP, x, y, 0);
+		if (keyboardDispatcher::instance()->is_pressed(VK_LMENU))
+			dsp->handle_event(mouseDispatcher::EV_RIGHT_UP, x, y, 0);
+		else
+			dsp->handle_event(mouseDispatcher::EV_LEFT_UP, x, y, 0);
 		return true;
 	case Common::EVENT_RBUTTONUP:
 		x = event.mouse.x;