[Scummvm-cvs-logs] scummvm master -> 24c6d50301cac8e4a7aa6c7d99186906fde8d71e
lordhoto
lordhoto at gmail.com
Mon Feb 1 02:30:58 CET 2016
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:
24c6d50301 SDL: Don't mix our key code with SDL's.
Commit: 24c6d50301cac8e4a7aa6c7d99186906fde8d71e
https://github.com/scummvm/scummvm/commit/24c6d50301cac8e4a7aa6c7d99186906fde8d71e
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-02-01T02:23:55+01:00
Commit Message:
SDL: Don't mix our key code with SDL's.
This case for F# keys was forgotten to update in 8530997fff7b5b9d558f7dd6a0d07c236e4de16f.
Changed paths:
backends/events/sdl/sdl-events.cpp
diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp
index 745f398..d6880d8 100644
--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@@ -111,7 +111,7 @@ int SdlEventSource::mapKey(SDLKey sdlKey, SDLMod mod, Uint16 unicode) {
Common::KeyCode key = SDLToOSystemKeycode(sdlKey);
if (key >= Common::KEYCODE_F1 && key <= Common::KEYCODE_F9) {
- return key - SDLK_F1 + Common::ASCII_F1;
+ return key - Common::KEYCODE_F1 + Common::ASCII_F1;
} else if (key >= Common::KEYCODE_KP0 && key <= Common::KEYCODE_KP9) {
return key - Common::KEYCODE_KP0 + '0';
} else if (key >= Common::KEYCODE_UP && key <= Common::KEYCODE_PAGEDOWN) {
More information about the Scummvm-git-logs
mailing list