[Scummvm-git-logs] scummvm master -> 99fd5ff800cb54f125f4f1eb44a0f5ac0f0b3b4b

[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:
99fd5ff800 SWORD2: Do not treat right/left click as a doubleclick. Fixes bug #11396


Commit: 99fd5ff800cb54f125f4f1eb44a0f5ac0f0b3b4b
    https://github.com/scummvm/scummvm/commit/99fd5ff800cb54f125f4f1eb44a0f5ac0f0b3b4b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-27T16:38:07+02:00

Commit Message:
SWORD2: Do not treat right/left click as a doubleclick. Fixes bug #11396

Previously, we could right click (which reads the object description), then
left click, and the second click was treated as a double click if the object
happened to be an exit node at the same time. That led to a softlock of the
engine.

Changed paths:
    engines/sword2/mouse.cpp


diff --git a/engines/sword2/mouse.cpp b/engines/sword2/mouse.cpp
index ba9accc0c0..3066b9e54d 100644
--- a/engines/sword2/mouse.cpp
+++ b/engines/sword2/mouse.cpp
@@ -824,7 +824,7 @@ void Mouse::normalMouse() {
 	_vm->_logic->writeVar(MOUSE_X, x + screenInfo->scroll_offset_x);
 	_vm->_logic->writeVar(MOUSE_Y, y + screenInfo->scroll_offset_y);
 
-	if (_mouseTouching == _vm->_logic->readVar(EXIT_CLICK_ID) && (me->buttons & RD_LEFTBUTTONDOWN)) {
+	if (_mouseTouching == _vm->_logic->readVar(EXIT_CLICK_ID) && (me->buttons & RD_LEFTBUTTONDOWN) && _oldButton == _buttonClick) {
 		// It's the exit double click situation. Let the existing
 		// interaction continue and start fading down. Switch the human
 		// off too