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

[digitall]

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:
d7972603e7 HDB: Fix Game Breaking Bug in Right Mouse Button Handling


Commit: d7972603e71f4d9cca0b998e72a47f2e1b07c095
    https://github.com/scummvm/scummvm/commit/d7972603e71f4d9cca0b998e72a47f2e1b07c095
Author: D G Turner (digitall at scummvm.org)
Date: 2019-09-22T00:11:51+01:00

Commit Message:
HDB: Fix Game Breaking Bug in Right Mouse Button Handling

The right mouse button (which is the "Use" button for throwing gems etc.)
function sets the Button B flag in the _buttons flag field, but never
cleared it. This resulted in blocking of setting of movement waypoints
with the left button and thus locked up the player character.

You could avoid this by using the "Return" key which is also mapped to
use, but this would only be possible on desktop ports or with a virtual
keyboard.

This commit fixes the mouse handling code to clear the flag and thus
avoids future bug reports.

Changed paths:
    engines/hdb/input.cpp


diff --git a/engines/hdb/input.cpp b/engines/hdb/input.cpp
index 093f525..09aa5d9 100644
--- a/engines/hdb/input.cpp
+++ b/engines/hdb/input.cpp
@@ -494,6 +494,9 @@ void Input::updateMouseButtons(int l, int m, int r) {
 
 		uint16 buttons = getButtons() | kButtonB;
 		setButtons(buttons);
+	} else if (!_mouseRButton) {
+		uint16 buttons = getButtons() & ~kButtonB;
+		setButtons(buttons);
 	}
 }