From af7ea8c525a3908f226a238c8a1edb3ad64cc936 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 4 Feb 2012 16:24:25 +0000 Subject: (svn r23891) -Fix-ish: compile failures with SDL 1.3 --- src/video/sdl_v.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/video') diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp index 1b8124f8e..8996240b3 100644 --- a/src/video/sdl_v.cpp +++ b/src/video/sdl_v.cpp @@ -277,13 +277,17 @@ bool VideoDriver_SDL::ClaimMousePointer() } struct VkMapping { +#if SDL_VERSION_ATLEAST(1, 3, 0) + SDL_Keycode vk_from; +#else uint16 vk_from; +#endif byte vk_count; byte map_to; }; #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[] = { /* Pageup stuff + up/down */ @@ -547,7 +551,11 @@ void VideoDriver_SDL::MainLoop() if (_exit_game) break; 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); +#endif #if defined(_DEBUG) if (_shift_pressed) #else -- cgit v1.2.3-70-g09d2