[Scummvm-cvs-logs] scummvm master -> 14f338e2dd5cce9e6968be75eca146fd40c856e4

[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:
14f338e2dd AGI: Revert revert the keyboard handling changes


Commit: 14f338e2dd5cce9e6968be75eca146fd40c856e4
    https://github.com/scummvm/scummvm/commit/14f338e2dd5cce9e6968be75eca146fd40c856e4
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-01T15:02:52+01:00

Commit Message:
AGI: Revert revert the keyboard handling changes

It seems the issues on AmigaOS aren't actually caused by the new
code. Reverting the revert.

Changed paths:
    engines/agi/keyboard.cpp



diff --git a/engines/agi/keyboard.cpp b/engines/agi/keyboard.cpp
index 9fb837b..07aec98 100644
--- a/engines/agi/keyboard.cpp
+++ b/engines/agi/keyboard.cpp
@@ -136,7 +136,6 @@ void AgiEngine::processEvents() {
 			}
 
 			key = event.kbd.ascii;
-#if 0
 			if (event.kbd.keycode >= Common::KEYCODE_KP0 && event.kbd.keycode <= Common::KEYCODE_KP9) {
 				if (!(event.kbd.flags & Common::KBD_NUM)) {
 					// HACK: Num-Lock not enabled
@@ -145,13 +144,8 @@ void AgiEngine::processEvents() {
 					key = 0;
 				}
 			}
-#endif
-			// FIXME: Checking .ascii this way seems to cause issues on at least AmigaOS
-			//        See bug #7009. For detailed information see engines/sci/event.cpp, EventManager::getScummVMEvent().
-			//        For now we are using the same code as in SCI to make it work.
-			//        Needs to get fixed in SDL backend / SDL itself.
-			//if ((key) && (key <= 0xFF)) {
-			if ((key) && (!(event.kbd.keycode & 0xFF00))) {
+
+			if ((key) && (key <= 0xFF)) {
 				// No special key, directly accept it
 				// Is ISO-8859-1, we need lower 128 characters only, which is plain ASCII, so no mapping required
 				if (Common::isAlpha(key)) {