unknownworlds/ns
0
0
Fork 0
mirror of https://github.com/unknownworlds/NS.git synced 2025-06-01 09:32:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mantis: 0001126

Browse source 
o Fixed the weapon/res column for the readyroom.

git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@500 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
puzl 2006-05-21 13:52:01 +00:00
parent f3bdf5244a
commit 6823ecd986
1 changed files with 41 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

73
releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp
View file

@ -727,6 +727,8 @@ int ScorePanel::GetIconFrame(void)
void ScorePanel::FillGrid() void ScorePanel::FillGrid()
{ {
bool isNsMode=( strnicmp(gHUD.GetMapName().c_str(), "ns_", 3) == 0 );
CSchemeManager *pSchemes = gViewPort->GetSchemeManager(); CSchemeManager *pSchemes = gViewPort->GetSchemeManager();
SchemeHandle_t hScheme = pSchemes->getSchemeHandle("Scoreboard Text"); SchemeHandle_t hScheme = pSchemes->getSchemeHandle("Scoreboard Text");
SchemeHandle_t hTitleScheme = pSchemes->getSchemeHandle("Scoreboard Title Text"); SchemeHandle_t hTitleScheme = pSchemes->getSchemeHandle("Scoreboard Title Text");
@ -751,7 +753,7 @@ void ScorePanel::FillGrid()
bool bNextRowIsGap = false; bool bNextRowIsGap = false;
m_HeaderLabels[COLUMN_EXTRA].setText(CHudTextMessage::BufferedLocaliseTextString("#EXTRA")); m_HeaderLabels[COLUMN_EXTRA].setText(CHudTextMessage::BufferedLocaliseTextString("#EXTRA"));
if ( strnicmp(gHUD.GetMapName().c_str(), "ns_", 3) == 0 ) { if ( isNsMode ) {
if ( gHUD.GetHUDTeam() == TEAM_ONE || gHUD.GetHUDTeam() == TEAM_THREE ) { if ( gHUD.GetHUDTeam() == TEAM_ONE || gHUD.GetHUDTeam() == TEAM_THREE ) {
m_HeaderLabels[COLUMN_EXTRA].setText(CHudTextMessage::BufferedLocaliseTextString("#COLWEAP")); m_HeaderLabels[COLUMN_EXTRA].setText(CHudTextMessage::BufferedLocaliseTextString("#COLWEAP"));
} }
@ -1248,41 +1250,48 @@ void ScorePanel::FillGrid()
case COLUMN_EXTRA: case COLUMN_EXTRA:
if(!theIsForEnemy && theExtraPlayerInfo->teamnumber != TEAM_IND && theExtraPlayerInfo->teamnumber != TEAM_SPECT ) if(!theIsForEnemy && theExtraPlayerInfo->teamnumber != TEAM_IND && theExtraPlayerInfo->teamnumber != TEAM_SPECT )
{ {
if ( strnicmp(gHUD.GetMapName().c_str(), "ns_", 3) == 0 && ( gHUD.GetHUDTeam() == TEAM_ONE || gHUD.GetHUDTeam() == TEAM_THREE ) ) { if ( isNsMode ) {
int r=CVAR_GET_FLOAT("cl_iconr"); if ( gHUD.GetHUDTeam() == TEAM_ONE || gHUD.GetHUDTeam() == TEAM_THREE ) {
int g=CVAR_GET_FLOAT("cl_icong"); int r=CVAR_GET_FLOAT("cl_iconr");
int b=CVAR_GET_FLOAT("cl_iconb"); int g=CVAR_GET_FLOAT("cl_icong");
r=max(min(255, r), 0); int b=CVAR_GET_FLOAT("cl_iconb");
g=max(min(255, g), 0); r=max(min(255, r), 0);
b=max(min(255, b), 0); g=max(min(255, g), 0);
b=max(min(255, b), 0);
switch(theExtraPlayerInfo->extra) { switch(theExtraPlayerInfo->extra) {
case AVH_WEAPON_HMG: case AVH_WEAPON_HMG:
pLabel->setFgColorAsImageColor(false); pLabel->setFgColorAsImageColor(false);
pLabel->setImage(m_pHMG); pLabel->setImage(m_pHMG);
m_pHMG->setColor(BuildColor(r, g, b, gHUD.GetGammaSlope())); m_pHMG->setColor(BuildColor(r, g, b, gHUD.GetGammaSlope()));
break; break;
case AVH_WEAPON_MG: case AVH_WEAPON_MG:
pLabel->setFgColorAsImageColor(false); pLabel->setFgColorAsImageColor(false);
pLabel->setImage(m_pLMG); pLabel->setImage(m_pLMG);
m_pLMG->setColor(BuildColor(r, g, b, gHUD.GetGammaSlope())); m_pLMG->setColor(BuildColor(r, g, b, gHUD.GetGammaSlope()));
break; break;
case AVH_WEAPON_SONIC: case AVH_WEAPON_SONIC:
pLabel->setFgColorAsImageColor(false); pLabel->setFgColorAsImageColor(false);
pLabel->setImage(m_pSG); pLabel->setImage(m_pSG);
m_pSG->setColor(BuildColor(r, g, b, gHUD.GetGammaSlope())); m_pSG->setColor(BuildColor(r, g, b, gHUD.GetGammaSlope()));
break; break;
case AVH_WEAPON_GRENADE_GUN: case AVH_WEAPON_GRENADE_GUN:
pLabel->setFgColorAsImageColor(false); pLabel->setFgColorAsImageColor(false);
pLabel->setImage(m_pGL); pLabel->setImage(m_pGL);
m_pGL->setColor(BuildColor(r, g, b, gHUD.GetGammaSlope())); m_pGL->setColor(BuildColor(r, g, b, gHUD.GetGammaSlope()));
break; break;
default: default:
break; break;
}
}
else if ( gHUD.GetHUDTeam() == TEAM_TWO || gHUD.GetHUDTeam() == TEAM_FOUR ) {
sprintf(sz, "%d", theExtraPlayerInfo->extra);
} }
} }
else { else {
sprintf(sz, "%d", theExtraPlayerInfo->extra); if ( gHUD.GetHUDTeam() != TEAM_IND && gHUD.GetHUDTeam() != TEAM_SPECT ) {
sprintf(sz, "%d", theExtraPlayerInfo->extra);
}
} }
} }
break; break;