|
|
|
@ -744,7 +744,6 @@ qboolean VID_CreateWindow( int width, int height, window_mode_t window_mode )
@@ -744,7 +744,6 @@ qboolean VID_CreateWindow( int width, int height, window_mode_t window_mode )
|
|
|
|
|
if( !glw_state.software ) |
|
|
|
|
SetBits( wndFlags, SDL_WINDOW_OPENGL ); |
|
|
|
|
|
|
|
|
|
#if !XASH_MOBILE_PLATFORM |
|
|
|
|
if( window_mode == WINDOW_MODE_WINDOWED ) |
|
|
|
|
{ |
|
|
|
|
SDL_Rect r; |
|
|
|
@ -787,10 +786,6 @@ qboolean VID_CreateWindow( int width, int height, window_mode_t window_mode )
@@ -787,10 +786,6 @@ qboolean VID_CreateWindow( int width, int height, window_mode_t window_mode )
|
|
|
|
|
SetBits( wndFlags, SDL_WINDOW_BORDERLESS ); |
|
|
|
|
xpos = ypos = 0; |
|
|
|
|
} |
|
|
|
|
#else |
|
|
|
|
SetBits( wndFlags, SDL_WINDOW_FULLSCREEN | SDL_WINDOW_FULLSCREEN_DESKTOP | SDL_WINDOW_INPUT_GRABBED ); |
|
|
|
|
xpos = ypos = SDL_WINDOWPOS_UNDEFINED; |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
if( !VID_CreateWindowWithSafeGL( wndname, xpos, ypos, width, height, wndFlags )) |
|
|
|
|
return false; |
|
|
|
@ -799,14 +794,12 @@ qboolean VID_CreateWindow( int width, int height, window_mode_t window_mode )
@@ -799,14 +794,12 @@ qboolean VID_CreateWindow( int width, int height, window_mode_t window_mode )
|
|
|
|
|
if( FBitSet( SDL_GetWindowFlags( host.hWnd ), SDL_WINDOW_MAXIMIZED|SDL_WINDOW_FULLSCREEN_DESKTOP ) != 0 ) |
|
|
|
|
SDL_GetWindowSize( host.hWnd, &width, &height ); |
|
|
|
|
|
|
|
|
|
#if !XASH_MOBILE_PLATFORM |
|
|
|
|
if( window_mode != WINDOW_MODE_WINDOWED ) |
|
|
|
|
{ |
|
|
|
|
if( !VID_SetScreenResolution( width, height, window_mode )) |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
else VID_RestoreScreenResolution(); |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
VID_SetWindowIcon( host.hWnd ); |
|
|
|
|
SDL_ShowWindow( host.hWnd ); |
|
|
|
@ -1175,6 +1168,14 @@ qboolean VID_SetMode( void )
@@ -1175,6 +1168,14 @@ qboolean VID_SetMode( void )
|
|
|
|
|
#endif // SDL_VERSION_ATLEAST( 2, 0, 0 )
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
#if XASH_MOBILE_PLATFORM |
|
|
|
|
if( Q_strcmp( vid_fullscreen.string, DEFAULT_FULLSCREEN )) |
|
|
|
|
{ |
|
|
|
|
Cvar_DirectSet( &vid_fullscreen, DEFAULT_FULLSCREEN ); |
|
|
|
|
Con_Reportf( S_ERROR "VID_SetMode: windowed unavailable on this platform\n" ); |
|
|
|
|
} |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
if( !FBitSet( vid_fullscreen.flags, FCVAR_CHANGED )) |
|
|
|
|
Cvar_DirectSet( &vid_fullscreen, DEFAULT_FULLSCREEN ); |
|
|
|
|
else |
|
|
|
|