diff options
author | Simon Howard | 2015-04-12 02:22:06 +0000 |
---|---|---|
committer | Simon Howard | 2015-04-12 02:22:06 +0000 |
commit | 5ddb558a635208d9c08210be8283c83a8d45278f (patch) | |
tree | b819fff758f618bf2398c99f8e3e665717e365c5 /src/i_video.c | |
parent | 95a7160ca80c21057ecfe72fdba4a2dd977223e3 (diff) | |
parent | fa3dc6f58921ec8299b1ec49913b75fda1659e74 (diff) | |
download | chocolate-doom-5ddb558a635208d9c08210be8283c83a8d45278f.tar.gz chocolate-doom-5ddb558a635208d9c08210be8283c83a8d45278f.tar.bz2 chocolate-doom-5ddb558a635208d9c08210be8283c83a8d45278f.zip |
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom
Diffstat (limited to 'src/i_video.c')
-rw-r--r-- | src/i_video.c | 14 |
1 files changed, 0 insertions, 14 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__ |