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 /textscreen | |
| 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 'textscreen')
| -rw-r--r-- | textscreen/txt_sdl.c | 8 | ||||
| -rw-r--r-- | textscreen/txt_window.c | 1 | ||||
| -rw-r--r-- | textscreen/txt_window_action.c | 1 |
3 files changed, 2 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; diff --git a/textscreen/txt_window.c b/textscreen/txt_window.c index 7b2e3568..bd892ac9 100644 --- a/textscreen/txt_window.c +++ b/textscreen/txt_window.c @@ -12,6 +12,7 @@ // GNU General Public License for more details. // +#include <stdio.h> #include <stdlib.h> #include <stdarg.h> #include <string.h> diff --git a/textscreen/txt_window_action.c b/textscreen/txt_window_action.c index a5fe84dc..94210d56 100644 --- a/textscreen/txt_window_action.c +++ b/textscreen/txt_window_action.c @@ -14,6 +14,7 @@ #include <stdlib.h> #include <string.h> +#include <ctype.h> #include "doomkeys.h" |