Fix silly key mapping bug. Update native with SDL gamepad support (that

needs more work).
This commit is contained in:
Henrik Rydgård 2013-07-14 13:52:02 +02:00
parent dcb400f85d
commit 4a49ec2e40
2 changed files with 6 additions and 4 deletions

View file

@ -698,9 +698,11 @@ void ControlsScreen::update(InputState &input) {
void KeyMappingNewKeyDialog::key(const KeyInput &key) {
if (key.flags & KEY_DOWN) {
last_kb_deviceid = key.deviceId;
last_kb_key = key.keyCode;
last_axis_id = -1;
if (key.keyCode != KEYCODE_EXT_MOUSEBUTTON_1) {
last_kb_deviceid = key.deviceId;
last_kb_key = key.keyCode;
last_axis_id = -1;
}
}
}

2
native

@ -1 +1 @@
Subproject commit ca7eb305e44b75307ff904f73e4e946f5a9f1395
Subproject commit ed1f13a33fdb5a210d35ac57a4cfc59b0a67a1a4