Make sure fullscreen does not work for in_nograb when manually Alt-Entering, too.

This commit is contained in:
Thilo Schulz 2008-03-26 16:20:21 +00:00
parent 401f7521ff
commit 9412316883
2 changed files with 8 additions and 1 deletions

View file

@ -1164,7 +1164,7 @@ void CL_KeyEvent (int key, qboolean down, unsigned time) {
{ {
if (keys[K_ALT].down) if (keys[K_ALT].down)
{ {
Key_ClearStates(); // Key_ClearStates(); // Thilo: why should we clear the key states here?
Cvar_SetValue( "r_fullscreen", Cvar_SetValue( "r_fullscreen",
!Cvar_VariableIntegerValue( "r_fullscreen" ) ); !Cvar_VariableIntegerValue( "r_fullscreen" ) );
return; return;

View file

@ -663,6 +663,13 @@ void GLimp_EndFrame( void )
else else
fullscreen = qfalse; 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? // Is the state we want different from the current state?
if( !!r_fullscreen->integer != fullscreen ) if( !!r_fullscreen->integer != fullscreen )
sdlToggled = SDL_WM_ToggleFullScreen( s ); sdlToggled = SDL_WM_ToggleFullScreen( s );