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

[m-kiewitz]

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:
fa66b823b8 SCI: change ascii detection for key event handling


Commit: fa66b823b835cad3ab0ca35636ae309a1d002b41
    https://github.com/scummvm/scummvm/commit/fa66b823b835cad3ab0ca35636ae309a1d002b41
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-01-28T20:19:34+01:00

Commit Message:
SCI: change ascii detection for key event handling

New way is probably better. Sadly we get a few keys atm in the
ascii field, like cursor left and the function keys. That's why
a check for <= 0xFF is needed.

Changed paths:
    engines/sci/event.cpp



diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp
index b1c0024..3f615f6 100644
--- a/engines/sci/event.cpp
+++ b/engines/sci/event.cpp
@@ -214,7 +214,7 @@ SciEvent EventManager::getScummVMEvent() {
 		//((ev.kbd.flags & Common::KBD_CAPS) ? SCI_KEYMOD_CAPSLOCK : 0) |
 		//((ev.kbd.flags & Common::KBD_SCRL) ? SCI_KEYMOD_SCRLOCK : 0) |
 
-	if (!(input.data & 0xFF00)) {
+	if ((input.character) && (input.character <= 0xFF)) {
 		// Directly accept most common keys without conversion
 		if ((input.character >= 0x80) && (input.character <= 0xFF)) {
 			// If there is no extended font, we will just clear the