From 46eb5ce2658a62be579cc81669fae01019b77561 Mon Sep 17 00:00:00 2001 From: Braden Obrzut Date: Mon, 24 Nov 2014 23:26:38 -0500 Subject: [PATCH] - Move cursor variables again due to shared code with Cocoa and SDL backends. --- src/sdl/i_gui.cpp | 4 ++-- src/sdl/sdlvideo.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/sdl/i_gui.cpp b/src/sdl/i_gui.cpp index bccd81972..b40fb7517 100644 --- a/src/sdl/i_gui.cpp +++ b/src/sdl/i_gui.cpp @@ -9,8 +9,8 @@ #include "v_palette.h" #include "textures.h" -SDL_Surface *cursorSurface = NULL; -SDL_Rect cursorBlit = {0, 0, 32, 32}; +extern SDL_Surface *cursorSurface; +extern SDL_Rect cursorBlit; #ifdef USE_XCURSOR // Xlib has its own GC, so don't let it interfere. diff --git a/src/sdl/sdlvideo.cpp b/src/sdl/sdlvideo.cpp index 59587fc0b..e4222633d 100644 --- a/src/sdl/sdlvideo.cpp +++ b/src/sdl/sdlvideo.cpp @@ -81,10 +81,11 @@ struct MiniModeInfo // EXTERNAL DATA DECLARATIONS ---------------------------------------------- extern IVideo *Video; -extern SDL_Surface *cursorSurface; -extern SDL_Rect cursorBlit; extern bool GUICapture; +SDL_Surface *cursorSurface = NULL; +SDL_Rect cursorBlit = {0, 0, 32, 32}; + EXTERN_CVAR (Float, Gamma) EXTERN_CVAR (Int, vid_maxfps) EXTERN_CVAR (Bool, cl_capfps)