[iortcw] 59/95: All: Remove the redundant screen updates in CG_DrawInformation

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to tag 1.51
in repository iortcw.

commit 0cf8608fdf1793ca3f77954c1521ea5b20959b04
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Sat May 6 05:42:35 2017 -0400

    All: Remove the redundant screen updates in CG_DrawInformation
    
    Rework of last commit...Updates seem to be handled in the renderer anyway
---
 MP/code/client/cl_cgame.c | 15 +++------------
 SP/code/cgame/cg_info.c   |  4 ++--
 SP/code/client/cl_cgame.c | 15 +++------------
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/MP/code/client/cl_cgame.c b/MP/code/client/cl_cgame.c
index 683f9a3..bf56393 100644
--- a/MP/code/client/cl_cgame.c
+++ b/MP/code/client/cl_cgame.c
@@ -560,20 +560,11 @@ intptr_t CL_CgameSystemCalls( intptr_t *args ) {
 		return 0;
 	case CG_UPDATESCREEN:
 		// this is used during lengthy level loading, so pump message loop
-		//Com_EventLoop();	// FIXME: if a server restarts here, BAD THINGS HAPPEN!
+		// Com_EventLoop();	// FIXME: if a server restarts here, BAD THINGS HAPPEN!
 		// We can't call Com_EventLoop here, a restart will crash and this _does_ happen
-		// if there is a map change while we are downloading at pk3.
+		// if there is a map change while we are downloading a pk3.
 		// ZOID
-		// Don't spam screen updates if we're vsynced
-		if ( Cvar_VariableIntegerValue( "r_swapInterval" ) )
-		{
-			static int lastUpdate = 0;
-
-			if ( lastUpdate == 0 || Sys_Milliseconds() - lastUpdate > 16 )
-				SCR_UpdateScreen();
-
-			lastUpdate = Sys_Milliseconds();
-		}
+		SCR_UpdateScreen();
 		return 0;
 	case CG_CM_LOADMAP:
 		CL_CM_LoadMap( VMA( 1 ) );
diff --git a/SP/code/cgame/cg_info.c b/SP/code/cgame/cg_info.c
index 1858f58..77cc085 100644
--- a/SP/code/cgame/cg_info.c
+++ b/SP/code/cgame/cg_info.c
@@ -411,7 +411,7 @@ void CG_DrawInformation( void ) {
 				UI_CENTER | UI_EXSMALLFONT | UI_DROPSHADOW, color );
 		}
 
-		trap_UpdateScreen();
+		//trap_UpdateScreen();
 		callCount--;
 		return;
 	}
@@ -436,7 +436,7 @@ void CG_DrawInformation( void ) {
 
 		trap_UI_Popup( "briefing" );
 
-		trap_UpdateScreen();
+		//trap_UpdateScreen();
 		callCount--;
 		return;
 	}
diff --git a/SP/code/client/cl_cgame.c b/SP/code/client/cl_cgame.c
index 16fb94a..a286135 100644
--- a/SP/code/client/cl_cgame.c
+++ b/SP/code/client/cl_cgame.c
@@ -479,20 +479,11 @@ intptr_t CL_CgameSystemCalls( intptr_t *args ) {
 		return 0;
 	case CG_UPDATESCREEN:
 		// this is used during lengthy level loading, so pump message loop
-		//Com_EventLoop();	// FIXME: if a server restarts here, BAD THINGS HAPPEN!
+		// Com_EventLoop();	// FIXME: if a server restarts here, BAD THINGS HAPPEN!
 		// We can't call Com_EventLoop here, a restart will crash and this _does_ happen
-		// if there is a map change while we are downloading at pk3.
+		// if there is a map change while we are downloading a pk3.
 		// ZOID
-		// Don't spam screen updates if we're vsynced
-		if ( Cvar_VariableIntegerValue( "r_swapInterval" ) )
-		{
-			static int lastUpdate = 0;
-
-			if ( lastUpdate == 0 || Sys_Milliseconds() - lastUpdate > 16 )
-				SCR_UpdateScreen();
-
-			lastUpdate = Sys_Milliseconds();
-		}
+		SCR_UpdateScreen();
 		return 0;
 	case CG_CM_LOADMAP:
 		CL_CM_LoadMap( VMA( 1 ) );

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git