[Scummvm-git-logs] scummvm master -> 1a7f516b18dcdc8404167010a76e0344a92f9e01

[dreammaster]

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:
1a7f516b18 NUVIE: Fix input handling of modifier keys


Commit: 1a7f516b18dcdc8404167010a76e0344a92f9e01
    https://github.com/scummvm/scummvm/commit/1a7f516b18dcdc8404167010a76e0344a92f9e01
Author: PushmePullyu (127053144+PushmePullyu at users.noreply.github.com)
Date: 2023-04-01T15:47:26-07:00

Commit Message:
NUVIE: Fix input handling of modifier keys

Do not discard modifier keys (CTRL, ALT, etc.) when looking up keybinds.

Changed paths:
    engines/ultima/nuvie/keybinding/keys.cpp


diff --git a/engines/ultima/nuvie/keybinding/keys.cpp b/engines/ultima/nuvie/keybinding/keys.cpp
index 120dc572ce7..c9ff2cc9970 100644
--- a/engines/ultima/nuvie/keybinding/keys.cpp
+++ b/engines/ultima/nuvie/keybinding/keys.cpp
@@ -367,12 +367,13 @@ KeyMap::iterator KeyBinder::get_sdlkey_index(const Common::KeyState &key) {
 }
 
 bool KeyBinder::HandleEvent(const Common::Event *ev) {
-	Common::KeyState key = ev->kbd.keycode;
+	Common::KeyState key = ev->kbd;
 	KeyMap::iterator sdlkey_index;
 
 	if (ev->type != Common::EVENT_KEYDOWN)
 		return false;
 
+	key.flags &= ~Common::KBD_STICKY;
 	sdlkey_index = get_sdlkey_index(key);
 	if (sdlkey_index != _bindings.end())
 		return DoAction((*sdlkey_index)._value);