From cba6390973f27410b5dc32923bc697ed9ff1d2cc Mon Sep 17 00:00:00 2001
From: matthijs <matthijs@openttd.org>
Date: Tue, 7 Feb 2012 10:12:11 +0000
Subject: (svn r23909) -Fix: [SDL] Fix keyboard-related segfault when compiling
 against SDL 1.3.

---
 src/video/sdl_v.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/video')

diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp
index 8996240b3..d22ad512e 100644
--- a/src/video/sdl_v.cpp
+++ b/src/video/sdl_v.cpp
@@ -561,8 +561,12 @@ void VideoDriver_SDL::MainLoop()
 #else
 		/* Speedup when pressing tab, except when using ALT+TAB
 		 * to switch to another application */
+#if SDL_VERSION_ATLEAST(1, 3, 0)
+		if (keys[SDL_SCANCODE_TAB] && (mod & KMOD_ALT) == 0)
+#else
 		if (keys[SDLK_TAB] && (mod & KMOD_ALT) == 0)
-#endif
+#endif /* SDL_VERSION_ATLEAST(1, 3, 0) */
+#endif /* defined(_DEBUG) */
 		{
 			if (!_networking && _game_mode != GM_MENU) _fast_forward |= 2;
 		} else if (_fast_forward & 2) {
@@ -582,11 +586,17 @@ void VideoDriver_SDL::MainLoop()
 
 			/* determine which directional keys are down */
 			_dirkeys =
+#if SDL_VERSION_ATLEAST(1, 3, 0)
+				(keys[SDL_SCANCODE_LEFT]  ? 1 : 0) |
+				(keys[SDL_SCANCODE_UP]    ? 2 : 0) |
+				(keys[SDL_SCANCODE_RIGHT] ? 4 : 0) |
+				(keys[SDL_SCANCODE_DOWN]  ? 8 : 0);
+#else
 				(keys[SDLK_LEFT]  ? 1 : 0) |
 				(keys[SDLK_UP]    ? 2 : 0) |
 				(keys[SDLK_RIGHT] ? 4 : 0) |
 				(keys[SDLK_DOWN]  ? 8 : 0);
-
+#endif
 			if (old_ctrl_pressed != _ctrl_pressed) HandleCtrlChanged();
 
 			/* The gameloop is the part that can run asynchroniously. The rest
-- 
cgit v1.2.3-70-g09d2