diff options
| author | rubidium <rubidium@openttd.org> | 2012-02-04 16:24:25 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2012-02-04 16:24:25 +0000 |
| commit | af7ea8c525a3908f226a238c8a1edb3ad64cc936 (patch) | |
| tree | 328c9a233bd74cfbca63a6a0bafa1e2d2f6eebf4 | |
| parent | 5c1cc27b033afd55e18ed90097027fd1ad7f4621 (diff) | |
| download | openttd-af7ea8c525a3908f226a238c8a1edb3ad64cc936.tar.xz | |
(svn r23891) -Fix-ish: compile failures with SDL 1.3
| -rw-r--r-- | src/video/sdl_v.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
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 |