yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-01-19 16:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

(Multi-Monitor)Code Cleanup

Browse source 
-We only need to init the display indices once in GLimp_Init
-We only need to clear the display indices once in GLimp_Shutdown
-Remove extra 'displayindex' variable
This commit is contained in:
Spirrwell 2019-06-16 01:11:20 -04:00
parent 03e3c6bf71
commit 0da8099de8
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/client/vid/glimp_sdl.c
View file

@ -78,11 +78,8 @@ ClearDisplayIndices(void)
}
static void
InitDisplayIndices(qboolean ClearExisting)
InitDisplayIndices()
{
if ( ClearExisting )
ClearDisplayIndices();
displayindices = malloc( ( num_displays + 1 ) * sizeof( char* ) );
for ( int i = 0; i < num_displays; i++ )
{
@ -99,17 +96,12 @@ InitDisplayIndices(qboolean ClearExisting)
static qboolean
CreateSDLWindow(int flags, int w, int h)
{
int displayindex = 0;
// Reset display index Cvar if out of bounds
if ( vid_displayindex->value < 0 || vid_displayindex->value >= num_displays)
Cvar_SetValue( "vid_displayindex", 0 );
else
{
displayindex = vid_displayindex->value;
}
// last_position_x and last_position_y aren't really used...
const int windowpos = SDL_WINDOWPOS_UNDEFINED_DISPLAY( displayindex );
const int windowpos = SDL_WINDOWPOS_UNDEFINED_DISPLAY( (int)vid_displayindex->value );
window = SDL_CreateWindow("Yamagi Quake II",
windowpos, windowpos,
@ -120,8 +112,6 @@ CreateSDLWindow(int flags, int w, int h)
last_display = SDL_GetWindowDisplayIndex(window);
SDL_GetWindowPosition(window,
&last_position_x, &last_position_y);
InitDisplayIndices( true );
}
return window != NULL;
@ -222,8 +212,6 @@ ShutdownGraphics(void)
window = NULL;
}
ClearDisplayIndices();
// make sure that after vid_restart the refreshrate will be queried from SDL2 again.
glimp_refreshRate = -1;
@ -257,6 +245,7 @@ GLimp_Init(void)
Com_Printf("SDL video driver is \"%s\".\n", SDL_GetCurrentVideoDriver());
num_displays = SDL_GetNumVideoDisplays();
InitDisplayIndices();
}
return true;
@ -280,6 +269,8 @@ GLimp_Shutdown(void)
{
SDL_QuitSubSystem(SDL_INIT_VIDEO);
}
ClearDisplayIndices();
}
/*