diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-01-26 10:13:40 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-01-26 10:13:40 +0100 |
| commit | eb2e62609992ab8b47f8805f2bc2cafce271b66f (patch) | |
| tree | 58d6c387f910e3a3348a6528127f4216b524ec57 /src/gui/setup_keyboard.cpp | |
| parent | 05dc1666dc794ed6aa7f6568b768c652f8922c4e (diff) | |
| parent | 8d06606835e3d01f537ebe96de8b216e64a1f969 (diff) | |
| download | mana-client-lpc2012.tar.gz mana-client-lpc2012.tar.bz2 mana-client-lpc2012.tar.xz mana-client-lpc2012.zip | |
Merge branch 'master' into lpc2012lpc2012
Diffstat (limited to 'src/gui/setup_keyboard.cpp')
| -rw-r--r-- | src/gui/setup_keyboard.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp index 5e29519b..b66ba3aa 100644 --- a/src/gui/setup_keyboard.cpp +++ b/src/gui/setup_keyboard.cpp @@ -178,8 +178,8 @@ void Setup_Keyboard::refreshAssignedKey(int index) caption = keyboard.getKeyCaption(index) + ": "; else { - char *temp = SDL_GetKeyName( - (SDLKey) keyboard.getKeyValue(index)); + const char *temp = SDL_GetKeyName( + (SDL_Scancode) keyboard.getKeyValue(index)); caption = strprintf("%-25s", (keyboard.getKeyCaption(index) + ": ").c_str()) + toString(temp); |