commit fa3dc6f58921ec8299b1ec49913b75fda1659e74
Author: Simon Howard <fraggle@soulsphere.org>
AuthorDate: Fri Apr 10 23:44:13 2015 -0400
Commit: Simon Howard <fraggle@soulsphere.org>
CommitDate: Fri Apr 10 23:44:13 2015 -0400
Strip out SDL_VERSION_ATLEAST #ifdef conditionals.
These were added ages ago as hacks to make the code compile with SDL2,
back when SDL2 was still in development. They aren't relevant any more
and aren't useful - the actual SDL2 port is proceeding on sdl2-branch.
---
src/i_video.c | 14 --------------
textscreen/txt_sdl.c | 8 --------
2 files changed, 22 deletions(-)
diff --git a/src/i_video.c b/src/i_video.c
index 8fb1f178..d0140a0b 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -479,9 +479,7 @@ static int TranslateKey(SDL_keysym *sym)
case SDLK_PAUSE: return KEY_PAUSE;
-#if !SDL_VERSION_ATLEAST(1, 3, 0)
case SDLK_EQUALS: return KEY_EQUALS;
-#endif
case SDLK_MINUS: return KEY_MINUS;
@@ -495,10 +493,8 @@ static int TranslateKey(SDL_keysym *sym)
case SDLK_LALT:
case SDLK_RALT:
-#if !SDL_VERSION_ATLEAST(1, 3, 0)
case SDLK_LMETA:
case SDLK_RMETA:
-#endif
return KEY_RALT;
case SDLK_CAPSLOCK: return KEY_CAPSLOCK;
@@ -829,11 +825,7 @@ static void CenterMouse(void)
// Clear any relative movement caused by warping
SDL_PumpEvents();
-#if SDL_VERSION_ATLEAST(1, 3, 0)
- SDL_GetRelativeMouseState(0, NULL, NULL);
-#else
SDL_GetRelativeMouseState(NULL, NULL);
-#endif
}
//
@@ -847,11 +839,7 @@ static void I_ReadMouse(void)
int x, y;
event_t ev;
-#if SDL_VERSION_ATLEAST(1, 3, 0)
- SDL_GetRelativeMouseState(0, &x, &y);
-#else
SDL_GetRelativeMouseState(&x, &y);
-#endif
if (x != 0 || y != 0)
{
@@ -2023,9 +2011,7 @@ void I_InitGraphics(void)
// has to be done before the call to SDL_SetVideoMode.
I_InitWindowTitle();
-#if !SDL_VERSION_ATLEAST(1, 3, 0)
I_InitWindowIcon();
-#endif
// Warning to OS X users... though they might never see it :(
#ifdef __MACOSX__
diff --git a/textscreen/txt_sdl.c b/textscreen/txt_sdl.c
index 5399c088..7d0e9a3e 100644
--- a/textscreen/txt_sdl.c
+++ b/textscreen/txt_sdl.c
@@ -412,11 +412,7 @@ void TXT_UpdateScreen(void)
void TXT_GetMousePosition(int *x, int *y)
{
-#if SDL_VERSION_ATLEAST(1, 3, 0)
- SDL_GetMouseState(0, x, y);
-#else
SDL_GetMouseState(x, y);
-#endif
*x /= font->w;
*y /= font->h;
@@ -466,10 +462,8 @@ static int TranslateKey(SDL_keysym *sym)
case SDLK_LALT:
case SDLK_RALT:
-#if !SDL_VERSION_ATLEAST(1, 3, 0)
case SDLK_LMETA:
case SDLK_RMETA:
-#endif
return KEY_RALT;
case SDLK_CAPSLOCK: return KEY_CAPSLOCK;
@@ -604,10 +598,8 @@ static void UpdateModifierState(SDL_keysym *sym, int pressed)
case SDLK_LALT:
case SDLK_RALT:
-#if !SDL_VERSION_ATLEAST(1, 3, 0)
case SDLK_LMETA:
case SDLK_RMETA:
-#endif
mod = TXT_MOD_ALT;
break;