diff options
| author | Simon Howard | 2015-04-10 23:44:13 -0400 |
|---|---|---|
| committer | Simon Howard | 2015-04-10 23:44:13 -0400 |
| commit | fa3dc6f58921ec8299b1ec49913b75fda1659e74 (patch) | |
| tree | b15e4fe0ad824d6ba0fa41d9e461c9d4fa113e1d /textscreen | |
| parent | 981d972f3da3418e58da11515db6979d3f85a08a (diff) | |
| download | chocolate-doom-fa3dc6f58921ec8299b1ec49913b75fda1659e74.tar.gz chocolate-doom-fa3dc6f58921ec8299b1ec49913b75fda1659e74.tar.bz2 chocolate-doom-fa3dc6f58921ec8299b1ec49913b75fda1659e74.zip | |
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.
Diffstat (limited to 'textscreen')
| -rw-r--r-- | textscreen/txt_sdl.c | 8 |
1 files changed, 0 insertions, 8 deletions
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; |