* Periodically update scoreboard when visible if +scores is held down a while

  or bound to a *lock key. This will also update pings during intermission

2 files changed, 4 insertions, 17 deletions

diff --git a/src/cgame/cg_consolecmds.c b/src/cgame/cg_consolecmds.c
index 23a22899..19216eea 100644
--- a/src/cgame/cg_consolecmds.c
+++ b/src/cgame/cg_consolecmds.c
@@ -111,26 +111,12 @@ static void CG_ScoresDown_f( void )
   {
     Menu_SetFeederSelection( menuScoreboard, FEEDER_ALIENTEAM_LIST, 0, NULL );
     Menu_SetFeederSelection( menuScoreboard, FEEDER_HUMANTEAM_LIST, 0, NULL );
-  }
-
-  if( CG_RequestScores( ) )
-  {
-    // leave the current scores up if they were already
-    // displayed, but if this is the first hit, clear them out
-    if( !cg.showScores )
-    {
-      if( cg_debugRandom.integer )
-        CG_Printf( "CG_ScoresDown_f: scores out of date\n" );
-
-      cg.showScores = qtrue;
-      cg.numScores = 0;
-    }
+    cg.showScores = qtrue;
   }
   else
   {
-    // show the cached contents even if they just pressed if it
-    // is within two seconds
-    cg.showScores = qtrue;
+    cg.showScores = qfalse;
+    cg.numScores = 0;
   }
 }
 
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index 7487a6fc..7268ec64 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -3283,6 +3283,7 @@ static qboolean CG_DrawScoreboard( void )
     return qfalse;
   }
 
+  CG_RequestScores( );
 
   if( menuScoreboard == NULL )
     menuScoreboard = Menus_FindByName( "teamscore_menu" );