diff options
| author | Thilo Schulz <arny@ats.s.bawue.de> | 2011-08-01 01:19:55 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-10 23:11:05 +0000 |
| commit | 819546192265e70832c75cecc29dce929a4feeec (patch) | |
| tree | a345b3d876d8dbdcccf1b13ff450fe0227bf2176 /src/sdl/sdl_input.c | |
| parent | 500076c2e63329331c2a98e88cfa34f8044a7b76 (diff) | |
Modular rendering system. Patch by use.less01 This might break MSVC builds. I'll take care of it later
Diffstat (limited to 'src/sdl/sdl_input.c')
| -rw-r--r-- | src/sdl/sdl_input.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sdl/sdl_input.c b/src/sdl/sdl_input.c index 83b26086..2cc3dcf4 100644 --- a/src/sdl/sdl_input.c +++ b/src/sdl/sdl_input.c @@ -503,7 +503,7 @@ static void IN_ActivateMouse( void ) } // in_nograb makes no sense in fullscreen mode - if( !r_fullscreen->integer ) + if( !Cvar_VariableIntegerValue("r_fullscreen") ) { if( in_nograb->modified || !mouseActive ) { @@ -531,7 +531,7 @@ static void IN_DeactivateMouse( void ) // Always show the cursor when the mouse is disabled, // but not when fullscreen - if( !r_fullscreen->integer ) + if( !Cvar_VariableIntegerValue("r_fullscreen") ) { if( ( Key_GetCatcher( ) == KEYCATCH_UI ) && ( SDL_GetAppState( ) & SDL_APPMOUSEFOCUS ) ) @@ -985,8 +985,8 @@ static void IN_ProcessEvents( void ) char width[32], height[32]; Com_sprintf( width, sizeof(width), "%d", e.resize.w ); Com_sprintf( height, sizeof(height), "%d", e.resize.h ); - ri.Cvar_Set( "r_width", width ); - ri.Cvar_Set( "r_height", height ); + Cvar_Set( "r_width", width ); + Cvar_Set( "r_height", height ); /* wait until user stops dragging for 1 second, so we aren't constantly recreating the GL context while he tries to drag...*/ @@ -1026,12 +1026,12 @@ void IN_Frame( void ) loading = !!( clc.state != CA_DISCONNECTED && clc.state != CA_ACTIVE ); cursorShowing = Key_GetCatcher( ) & KEYCATCH_UI; - if( !r_fullscreen->integer && ( Key_GetCatcher( ) & KEYCATCH_CONSOLE ) ) + if( !Cvar_VariableIntegerValue("r_fullscreen") && ( Key_GetCatcher( ) & KEYCATCH_CONSOLE ) ) { // Console is down in windowed mode IN_DeactivateMouse( ); } - else if( !r_fullscreen->integer && loading ) + else if( !Cvar_VariableIntegerValue("r_fullscreen") && loading ) { // Loading in windowed mode IN_DeactivateMouse( ); |