Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make focusState a static to main.c, instead of a global from frame.c 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7240 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2009-04-29 19:07:22 +00:00 committed by Git SVN Gateway
parent e16e034ec7
commit a9b8a20aa5
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/framework/frame.c
View File

@ -51,8 +51,6 @@ static const enum CURSOR_TYPE cursor_type =
static CURSOR currentCursor = ~(CURSOR)0; static CURSOR currentCursor = ~(CURSOR)0;
static SDL_Cursor* aCursors[CURSOR_MAX]; static SDL_Cursor* aCursors[CURSOR_MAX];
FOCUS_STATE focusState = FOCUS_IN;
bool selfTest = false; bool selfTest = false;
/************************************************************************************ /************************************************************************************

6
lib/framework/frame.h
View File

@ -69,12 +69,6 @@ extern bool selfTest;
*/ */
extern void frameShutDown(void); extern void frameShutDown(void);
typedef enum _focus_state
{
FOCUS_OUT, // Window does not have the focus
FOCUS_IN, // Window has got the focus
} FOCUS_STATE;
/*! /*!
* Set the framerate limit * Set the framerate limit
* *

7
src/main.c
View File

@ -85,6 +85,11 @@
# define DATADIR "data" # define DATADIR "data"
#endif #endif
typedef enum _focus_state
{
FOCUS_OUT, // Window does not have the focus
FOCUS_IN, // Window has got the focus
} FOCUS_STATE;
#if defined(WZ_OS_WIN) #if defined(WZ_OS_WIN)
# define WZ_WRITEDIR "Warzone 2100 2.2" # define WZ_WRITEDIR "Warzone 2100 2.2"
@ -119,7 +124,7 @@ char KeyMapPath[PATH_MAX];
static GS_GAMEMODE gameStatus = GS_TITLE_SCREEN; static GS_GAMEMODE gameStatus = GS_TITLE_SCREEN;
// Status of the gameloop // Status of the gameloop
static int gameLoopStatus = 0; static int gameLoopStatus = 0;
extern FOCUS_STATE focusState; static FOCUS_STATE focusState = FOCUS_IN;
extern void debug_callback_stderr( void**, const char * ); extern void debug_callback_stderr( void**, const char * );
extern void debug_callback_win32debug( void**, const char * ); extern void debug_callback_win32debug( void**, const char * );