X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=vid_shared.c;h=d253881cbd4fea9f2a626a83b62cf2d335b13dd0;hb=e88a73794afa1f0fe65fc70d318f4e288cabc0d1;hp=6488195178c413a1bad4603eaab6dca52ffcff62;hpb=df8727697622029dd7a03047999ffc19b49e44ea;p=xonotic%2Fdarkplaces.git

diff --git a/vid_shared.c b/vid_shared.c
index 64881951..d253881c 100644
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -70,7 +70,7 @@ cvar_t vid_bitsperpixel = {CVAR_SAVE, "vid_bitsperpixel", "32"};
 
 cvar_t vid_vsync = {CVAR_SAVE, "vid_vsync", "0"};
 cvar_t vid_mouse = {CVAR_SAVE, "vid_mouse", "1"};
-cvar_t gl_combine = {CVAR_SAVE, "gl_combine", "1"};
+cvar_t gl_combine = {0, "gl_combine", "1"};
 cvar_t gl_finish = {0, "gl_finish", "0"};
 
 cvar_t v_gamma = {CVAR_SAVE, "v_gamma", "1"};
@@ -887,19 +887,15 @@ void VID_Shared_Init(void)
 		Cvar_Set("gl_combine", "0");
 }
 
-int current_vid_fullscreen;
-int current_vid_width;
-int current_vid_height;
-int current_vid_bitsperpixel;
 int VID_Mode(int fullscreen, int width, int height, int bpp)
 {
 	Con_Printf("Video: %s %dx%dx%d\n", fullscreen ? "fullscreen" : "window", width, height, bpp);
 	if (VID_InitMode(fullscreen, width, height, bpp))
 	{
-		current_vid_fullscreen = fullscreen;
-		current_vid_width = width;
-		current_vid_height = height;
-		current_vid_bitsperpixel = bpp;
+		vid.fullscreen = fullscreen;
+		vid.width = width;
+		vid.height = height;
+		vid.bitsperpixel = bpp;
 		Cvar_SetValueQuick(&vid_fullscreen, fullscreen);
 		Cvar_SetValueQuick(&vid_width, width);
 		Cvar_SetValueQuick(&vid_height, height);
@@ -931,14 +927,14 @@ void VID_Restart_f(void)
 		return;
 
 	Con_Printf("VID_Restart: changing from %s %dx%dx%dbpp, to %s %dx%dx%dbpp.\n",
-		current_vid_fullscreen ? "fullscreen" : "window", current_vid_width, current_vid_height, current_vid_bitsperpixel,
+		vid.fullscreen ? "fullscreen" : "window", vid.width, vid.height, vid.bitsperpixel,
 		vid_fullscreen.integer ? "fullscreen" : "window", vid_width.integer, vid_height.integer, vid_bitsperpixel.integer);
 	VID_CloseSystems();
 	VID_Shutdown();
 	if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer))
 	{
 		Con_Print("Video mode change failed\n");
-		if (!VID_Mode(current_vid_fullscreen, current_vid_width, current_vid_height, current_vid_bitsperpixel))
+		if (!VID_Mode(vid.fullscreen, vid.width, vid.height, vid.bitsperpixel))
 			Sys_Error("Unable to restore to last working video mode\n");
 	}
 	VID_OpenSystems();