[Scummvm-cvs-logs] scummvm master -> e3be574936e742656904847c551c946eb1d8f314

[eriktorbjorn]

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:
e3be574936 SHERLOCK: Add missing events.getKey() when checking for "pending D keys"


Commit: e3be574936e742656904847c551c946eb1d8f314
    https://github.com/scummvm/scummvm/commit/e3be574936e742656904847c551c946eb1d8f314
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-08-31T07:10:49+02:00

Commit Message:
SHERLOCK: Add missing events.getKey() when checking for "pending D keys"

This is consistent with what happens when checking for "pending U
keys", so I think it's correct, but the Scalpel keyboard handling
doesn't work very well at the moment anyway. Probably at least partly
because of the way it mixes char and Common::KeyCode. I haven't
been able to wrap my head around it...

Changed paths:
    engines/sherlock/scalpel/scalpel_user_interface.cpp



diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp
index a67d464..efcf6ea 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.cpp
+++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp
@@ -860,7 +860,7 @@ void ScalpelUserInterface::doEnvControl() {
 				// Check whether there are more pending D keys pressed
 				moreKeys = false;
 				if (events.kbHit()) {
-					Common::KeyState keyState;
+					Common::KeyState keyState = events.getKey();
 					_key = toupper(keyState.keycode);
 
 					moreKeys = _key == 'D';