[Scummvm-cvs-logs] scummvm master -> 674c625209a8a3e684ae238a3af676110f6e5254

[criezy]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1ad6cc2376 NEWS: Mention new Finnish translation
674c625209 DREAMWEB: Fix key handling for non-QWERTY layouts


Commit: 1ad6cc2376b475943466fe35458dd04848fa6ad6
    https://github.com/scummvm/scummvm/commit/1ad6cc2376b475943466fe35458dd04848fa6ad6
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2012-12-02T06:41:16-08:00

Commit Message:
NEWS: Mention new Finnish translation

Changed paths:
    NEWS



diff --git a/NEWS b/NEWS
index 85d114a..29cde45 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ For a more comprehensive changelog of the latest experimental code, see:
      select the old one as default too.
    - Rewrote VideoDecoder subsystem.
    - Added Galician translation.
+   - Added Finnish translation.
 
   Cine:
    - Improved audio support for Amiga and AtariST versions of Future Wars.


Commit: 674c625209a8a3e684ae238a3af676110f6e5254
    https://github.com/scummvm/scummvm/commit/674c625209a8a3e684ae238a3af676110f6e5254
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2012-12-02T06:41:17-08:00

Commit Message:
DREAMWEB: Fix key handling for non-QWERTY layouts

This fixes bug #3590814.
The case for KP0-KP9 can probably be removed as it should be
handled by the case above. But I don't have a keyboard with
keypad to test. So I am leaving it for now.

Changed paths:
    engines/dreamweb/dreamweb.cpp



diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index f7b291b..c3ede46 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -332,11 +332,12 @@ void DreamWebEngine::processEvents() {
 			softKey = 0;
 
 			debug(1, "DreamWebEngine::processEvents() KeyDown keycode:%d ascii:0x%02x", event.kbd.keycode, event.kbd.ascii);
-			if (event.kbd.keycode >= Common::KEYCODE_a && event.kbd.keycode <= Common::KEYCODE_z) {
+			if ((event.kbd.ascii >= 'a' && event.kbd.ascii <= 'z') ||
+				(event.kbd.ascii >= 'A' && event.kbd.ascii <= 'Z')) {
 				softKey = event.kbd.ascii & ~0x20; // (& ~0x20) forces ascii codes for a-z to map to A-Z
-			} else if (event.kbd.keycode == Common::KEYCODE_MINUS ||
-				event.kbd.keycode == Common::KEYCODE_SPACE ||
-				(event.kbd.keycode >= Common::KEYCODE_0 && event.kbd.keycode <= Common::KEYCODE_9)) {
+			} else if (event.kbd.ascii == '-' ||
+				event.kbd.ascii == ' ' ||
+				(event.kbd.ascii >= '0' && event.kbd.ascii <= '9')) {
 				softKey = event.kbd.ascii;
 			} else if (event.kbd.keycode >= Common::KEYCODE_KP0 && event.kbd.keycode <= Common::KEYCODE_KP9) {
 				softKey = event.kbd.keycode - Common::KEYCODE_KP0 + '0';