From 35ddb6b4018174c455ba1d60b20b241697e93c8f Mon Sep 17 00:00:00 2001 From: puzl Date: Mon, 8 May 2006 23:52:55 +0000 Subject: [PATCH] o Fixed the bug where the scoreboard wasn't rendered correctly when dead. git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@469 67975925-1194-0748-b3d5-c16f83f1a3a1 --- releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp b/releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp index 225f9706..6debadc0 100644 --- a/releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp +++ b/releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp @@ -748,10 +748,10 @@ void ScorePanel::FillGrid() bool bNextRowIsGap = false; m_HeaderLabels[COLUMN_EXTRA].setText(CHudTextMessage::BufferedLocaliseTextString("#EXTRA")); if ( strnicmp(gHUD.GetMapName().c_str(), "ns_", 3) == 0 ) { - if ( gHUD.GetIsMarine() ) { + if ( gHUD.GetHUDTeam() == TEAM_ONE || gHUD.GetHUDTeam() == TEAM_THREE ) { m_HeaderLabels[COLUMN_EXTRA].setText(CHudTextMessage::BufferedLocaliseTextString("#COLWEAP")); } - else if ( gHUD.GetIsAlien() ) { + else if ( gHUD.GetHUDTeam() == TEAM_TWO || gHUD.GetHUDTeam() == TEAM_FOUR ) { m_HeaderLabels[COLUMN_EXTRA].setText(CHudTextMessage::BufferedLocaliseTextString("#COLRES")); } } @@ -1244,7 +1244,7 @@ void ScorePanel::FillGrid() case COLUMN_EXTRA: if(!theIsForEnemy && theExtraPlayerInfo->teamnumber != TEAM_IND && theExtraPlayerInfo->teamnumber != TEAM_SPECT ) { - if ( gHUD.GetIsMarine() && !gHUD.GetIsCombatMode() ) { + if ( strnicmp(gHUD.GetMapName().c_str(), "ns_", 3) == 0 && ( gHUD.GetHUDTeam() == TEAM_ONE || gHUD.GetHUDTeam() == TEAM_THREE ) ) { int r=CVAR_GET_FLOAT("cl_iconr"); int g=CVAR_GET_FLOAT("cl_icong"); int b=CVAR_GET_FLOAT("cl_iconb");