From: vortex <vortex@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 9 Aug 2012 18:38:54 +0000 (+0000)
Subject: UNMERGE! New cvar scr_loadingscreen_maxfps (default 10) which restricts maximum numbe... 
X-Git-Tag: xonotic-v0.7.0~105
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7870aedba9095a81380ac7eacad962b2c9ccc11f;p=xonotic%2Fdarkplaces.git

UNMERGE! New cvar scr_loadingscreen_maxfps (default 10) which restricts maximum number of loading screen updates per second. This will halve loading times of quake maps with vid_vsync 1 as it really spends more time on drawing loading screen than on actual loading there.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11840 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=ac6244346ed7754e5d178393cb5116ecc7cefe16
---

diff --git a/cl_screen.c b/cl_screen.c
index 69f71010..0bd156eb 100644
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -43,7 +43,6 @@ cvar_t scr_loadingscreen_count = {0, "scr_loadingscreen_count","1", "number of l
 cvar_t scr_loadingscreen_firstforstartup = {0, "scr_loadingscreen_firstforstartup","0", "remove loading.tga from random scr_loadingscreen_count selection and only display it on client startup, 0 = normal, 1 = firstforstartup"};
 cvar_t scr_loadingscreen_barcolor = {0, "scr_loadingscreen_barcolor", "0 0 1", "rgb color of loadingscreen progress bar"};
 cvar_t scr_loadingscreen_barheight = {0, "scr_loadingscreen_barheight", "8", "the height of the loadingscreen progress bar"};
-cvar_t scr_loadingscreen_maxfps = {0, "scr_loadingscreen_maxfps", "10", "restrict maximal FPS for loading screen so it will not update very often (this will make lesser loading times on a maps loading large number of models)"};
 cvar_t scr_infobar_height = {0, "scr_infobar_height", "8", "the height of the infobar items"};
 cvar_t vid_conwidth = {CVAR_SAVE, "vid_conwidth", "640", "virtual width of 2D graphics system"};
 cvar_t vid_conheight = {CVAR_SAVE, "vid_conheight", "480", "virtual height of 2D graphics system"};
@@ -920,7 +919,6 @@ void CL_Screen_Init(void)
 	Cvar_RegisterVariable (&scr_loadingscreen_firstforstartup);
 	Cvar_RegisterVariable (&scr_loadingscreen_barcolor);
 	Cvar_RegisterVariable (&scr_loadingscreen_barheight);
-	Cvar_RegisterVariable (&scr_loadingscreen_maxfps);
 	Cvar_RegisterVariable (&scr_infobar_height);
 	Cvar_RegisterVariable (&scr_showram);
 	Cvar_RegisterVariable (&scr_showturtle);
@@ -2131,8 +2129,6 @@ static void SCR_DrawLoadingScreen_SharedFinish (qboolean clear)
 	VID_Finish();
 }
 
-static float loadingscreen_lastupdate;
-
 void SCR_UpdateLoadingScreen (qboolean clear, qboolean startup)
 {
 	keydest_t	old_key_dest;
@@ -2142,15 +2138,6 @@ void SCR_UpdateLoadingScreen (qboolean clear, qboolean startup)
 	if (vid_hidden || cls.state == ca_dedicated)
 		return;
 
-	// limit update rate
-	if (scr_loadingscreen_maxfps.value)
-	{
-		float t = Sys_DirtyTime();
-		if ((t - loadingscreen_lastupdate) < 1.0f/scr_loadingscreen_maxfps.value)
-			return;
-		loadingscreen_lastupdate = t;
-	}
-
 	if(!scr_loadingscreen_background.integer)
 		clear = true;