diff options
| author | Tim Angus <tim@ngus.net> | 2009-11-22 15:04:04 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:17:22 +0000 |
| commit | 7aa5ec7e92a51ecaffb480d73019f4a8a9db452b (patch) | |
| tree | cbff2be8ef69f245ba2a62fff267dfba1a9877d6 | |
| parent | af1e7bf53706513472f6646826c84a1f53dcfcce (diff) | |
* Fix broken scoreboard
| -rw-r--r-- | src/cgame/cg_draw.c | 12 | ||||
| -rw-r--r-- | src/ui/ui_shared.h | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index d42b2bfc..24b49747 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -1231,7 +1231,10 @@ Draw all the status / pacifier stuff during level loading */ void CG_DrawLoadingScreen( void ) { - Menu_Paint( Menus_FindByName( "Loading" ), qtrue ); + menuDef_t *menu = Menus_FindByName( "Loading" ); + + Menu_Update( menu ); + Menu_Paint( menu, qtrue ); } float CG_GetValue( int ownerDraw ) @@ -3116,6 +3119,7 @@ static qboolean CG_DrawScoreboard( void ) firstTime = qfalse; } + Menu_Update( menuScoreboard ); Menu_Paint( menuScoreboard, qtrue ); } @@ -3129,7 +3133,10 @@ CG_DrawIntermission */ static void CG_DrawIntermission( void ) { - Menu_Paint( Menus_FindByName( "default_hud" ), qtrue ); + menuDef_t *menu = Menus_FindByName( "default_hud" ); + + Menu_Update( menu ); + Menu_Paint( menu, qtrue ); cg.scoreFadeTime = cg.time; cg.scoreBoardShowing = CG_DrawScoreboard( ); @@ -3275,6 +3282,7 @@ static void CG_Draw2D( void ) CG_Error( "Default HUD could not be found" ); } + Menu_Update( menu ); Menu_Paint( menu, qtrue ); CG_DrawVote( TEAM_NONE ); diff --git a/src/ui/ui_shared.h b/src/ui/ui_shared.h index 3357ef60..aa49a8a0 100644 --- a/src/ui/ui_shared.h +++ b/src/ui/ui_shared.h @@ -511,6 +511,7 @@ void Menus_CloseByName( const char *p ); void Display_HandleKey( int key, qboolean down, int x, int y ); void LerpColor( vec4_t a, vec4_t b, vec4_t c, float t ); void Menus_CloseAll( void ); +void Menu_Update( menuDef_t *menu ); void Menu_Paint( menuDef_t *menu, qboolean forcePaint ); void Menu_SetFeederSelection( menuDef_t *menu, int feeder, int index, const char *name ); void Display_CacheAll( void ); |