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

[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:
bc0dd6f821 SCI: Fix regression of previous keycode commit


Commit: bc0dd6f8214201a4b2220c72702d4f3aff061f0d
    https://github.com/scummvm/scummvm/commit/bc0dd6f8214201a4b2220c72702d4f3aff061f0d
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-02T11:43:58+01:00

Commit Message:
SCI: Fix regression of previous keycode commit

7aeadba863ed1893fa6095008d35b32ce5117749
Thanks LordHoto for spotting it

Changed paths:
    engines/sci/event.cpp



diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp
index 8a5d67d..1f7cc01 100644
--- a/engines/sci/event.cpp
+++ b/engines/sci/event.cpp
@@ -268,7 +268,7 @@ SciEvent EventManager::getScummVMEvent() {
 		// SCI_K_SHIFT_F1 == 84 << 8
 		input.character = SCI_KEY_F1 + ((scummVMKeycode - Common::KEYCODE_F1)<<8);
 		if (ourModifiers & Common::KBD_SHIFT)
-			input.character = scummVMKeycode + 0x1900;
+			input.character = input.character + 0x1900;
 	} else {
 		// Special keys that need conversion
 		for (int i = 0; i < ARRAYSIZE(keyMappings); i++) {