aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-03-26 16:20:21 +0000
committerthilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-03-26 16:20:21 +0000
commit0e392efbac290666260e2782af1fd4f5ce0d09f6 (patch)
treed9e0b9ae96e9d05e031c856d26c0c901685ff317
parentf7477528e1c1eaa2a06ca71c1496bb5f30fcd8bb (diff)
downloadioquake3-aero-0e392efbac290666260e2782af1fd4f5ce0d09f6.tar.gz
ioquake3-aero-0e392efbac290666260e2782af1fd4f5ce0d09f6.zip
Make sure fullscreen does not work for in_nograb when manually Alt-Entering, too.
git-svn-id: svn://svn.icculus.org/quake3/trunk@1282 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--code/client/cl_keys.c2
-rw-r--r--code/sdl/sdl_glimp.c7
2 files changed, 8 insertions, 1 deletions
diff --git a/code/client/cl_keys.c b/code/client/cl_keys.c
index 38f41d0..72fdbe8 100644
--- a/code/client/cl_keys.c
+++ b/code/client/cl_keys.c
@@ -1164,7 +1164,7 @@ void CL_KeyEvent (int key, qboolean down, unsigned time) {
{
if (keys[K_ALT].down)
{
- Key_ClearStates();
+// Key_ClearStates(); // Thilo: why should we clear the key states here?
Cvar_SetValue( "r_fullscreen",
!Cvar_VariableIntegerValue( "r_fullscreen" ) );
return;
diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c
index 3f5ba12..a6c0a30 100644
--- a/code/sdl/sdl_glimp.c
+++ b/code/sdl/sdl_glimp.c
@@ -662,6 +662,13 @@ void GLimp_EndFrame( void )
fullscreen = qtrue;
else
fullscreen = qfalse;
+
+ if (r_fullscreen->integer && Cvar_VariableIntegerValue( "in_nograb" ))
+ {
+ ri.Printf( PRINT_ALL, "Fullscreen not allowed with in_nograb 1\n");
+ ri.Cvar_Set( "r_fullscreen", "0" );
+ r_fullscreen->modified = qfalse;
+ }
// Is the state we want different from the current state?
if( !!r_fullscreen->integer != fullscreen )