[Scummvm-git-logs] scummvm branch-2-7 -> cfe935ec29d94440cfc5f14130d78d6949732a70

AndywinXp noreply at scummvm.org
Sun Apr 2 09:37:17 UTC 2023


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:
cfe935ec29 SCUMM: Fix keyboard inputs being lost during mouse inputs


Commit: cfe935ec29d94440cfc5f14130d78d6949732a70
    https://github.com/scummvm/scummvm/commit/cfe935ec29d94440cfc5f14130d78d6949732a70
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-04-02T11:37:02+02:00

Commit Message:
SCUMM: Fix keyboard inputs being lost during mouse inputs

The line we're amending was applied a while ago when there had
been issues with COMI losing mouse inputs during a keyboard press;
apparently this has been resolved in a different way, and keeping it
(on the contrary) loses keyboard inputs.

This has been tested by the speedrun community.

Changed paths:
    engines/scumm/input.cpp


diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 332da4ae734..8fe89291cd7 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -459,7 +459,7 @@ void ScummEngine::processInput() {
 	_leftBtnPressed &= ~msClicked;
 	_rightBtnPressed &= ~msClicked;
 
-	if (_mouseAndKeyboardStat || !lastKeyHit.ascii)
+	if (!lastKeyHit.ascii)
 		return;
 
 	processKeyboard(lastKeyHit);




More information about the Scummvm-git-logs mailing list