mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r23891) -Fix-ish: compile failures with SDL 1.3

release/1.2
rubidium 2012-02-04 16:24:25 +00:00
parent 5c1cc27b03
commit af7ea8c525
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/video/sdl_v.cpp
View File

@ -277,13 +277,17 @@ bool VideoDriver_SDL::ClaimMousePointer()
} }
struct VkMapping { struct VkMapping {
#if SDL_VERSION_ATLEAST(1, 3, 0)
SDL_Keycode vk_from;
#else
uint16 vk_from; uint16 vk_from;
#endif
byte vk_count; byte vk_count;
byte map_to; byte map_to;
}; };
#define AS(x, z) {x, 0, z} #define AS(x, z) {x, 0, z}
#define AM(x, y, z, w) {x, y - x, z} #define AM(x, y, z, w) {x, (byte)(y - x), z}
static const VkMapping _vk_mapping[] = { static const VkMapping _vk_mapping[] = {
/* Pageup stuff + up/down */ /* Pageup stuff + up/down */
@ -547,7 +551,11 @@ void VideoDriver_SDL::MainLoop()
if (_exit_game) break; if (_exit_game) break;
mod = SDL_CALL SDL_GetModState(); mod = SDL_CALL SDL_GetModState();
#if SDL_VERSION_ATLEAST(1, 3, 0)
keys = SDL_CALL SDL_GetKeyboardState(&numkeys);
#else
keys = SDL_CALL SDL_GetKeyState(&numkeys); keys = SDL_CALL SDL_GetKeyState(&numkeys);
#endif
#if defined(_DEBUG) #if defined(_DEBUG)
if (_shift_pressed) if (_shift_pressed)
#else #else