unknownworlds/ns
0
0
Fork 0
mirror of https://github.com/unknownworlds/NS.git synced 2024-11-26 22:41:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

o Changed the order of weapon/res and latency

Browse source 
o Fixed some issues with spectating the scoreboard.



git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@525 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
puzl 2006-06-05 14:31:13 +00:00
parent 5c0f9caf6f
commit 5c57cd46e1
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -150,8 +150,8 @@ SBColumnInfo g_ColumnInfo[NUM_COLUMNS] =
{"#SCORE", 40, Label::a_east}, // score {"#SCORE", 40, Label::a_east}, // score
{"#KILLS", 40, Label::a_east}, // kills {"#KILLS", 40, Label::a_east}, // kills
{"#DEATHS", 40, Label::a_east}, // deaths {"#DEATHS", 40, Label::a_east}, // deaths
{"#LATENCY", 40, Label::a_east}, // ping
{NULL, 40, Label::a_east}, // resources {NULL, 40, Label::a_east}, // resources
{"#LATENCY", 40, Label::a_east}, // ping
{"#VOICE", 40, Label::a_east}, {"#VOICE", 40, Label::a_east},
{NULL, 2, Label::a_east}, // blank column to take up the slack {NULL, 2, Label::a_east}, // blank column to take up the slack
}; };
@ -1252,7 +1252,7 @@ void ScorePanel::FillGrid()
if(!theIsForEnemy && theExtraPlayerInfo->teamnumber != TEAM_IND && theExtraPlayerInfo->teamnumber != TEAM_SPECT ) if(!theIsForEnemy && theExtraPlayerInfo->teamnumber != TEAM_IND && theExtraPlayerInfo->teamnumber != TEAM_SPECT )
{ {
if ( isNsMode ) { if ( isNsMode ) {
if ( gHUD.GetHUDTeam() == TEAM_ONE || gHUD.GetHUDTeam() == TEAM_THREE ) { if ( theExtraPlayerInfo->teamnumber == TEAM_ONE || theExtraPlayerInfo->teamnumber == TEAM_THREE ) {
int r=CVAR_GET_FLOAT("cl_iconr"); int r=CVAR_GET_FLOAT("cl_iconr");
int g=CVAR_GET_FLOAT("cl_icong"); int g=CVAR_GET_FLOAT("cl_icong");
int b=CVAR_GET_FLOAT("cl_iconb"); int b=CVAR_GET_FLOAT("cl_iconb");
@ -1285,7 +1285,7 @@ void ScorePanel::FillGrid()
break; break;
} }
} }
else if ( gHUD.GetHUDTeam() == TEAM_TWO || gHUD.GetHUDTeam() == TEAM_FOUR ) { else if ( theExtraPlayerInfo->teamnumber == TEAM_TWO || theExtraPlayerInfo->teamnumber == TEAM_FOUR ) {
sprintf(sz, "%d", theExtraPlayerInfo->extra); sprintf(sz, "%d", theExtraPlayerInfo->extra);
} }
} }

4
releases/3.2.0/source/cl_dll/vgui_ScorePanel.h
View file

@ -23,8 +23,8 @@
#define COLUMN_SCORE 4 #define COLUMN_SCORE 4
#define COLUMN_KILLS 5 #define COLUMN_KILLS 5
#define COLUMN_DEATHS 6 #define COLUMN_DEATHS 6
#define COLUMN_LATENCY 7 #define COLUMN_EXTRA 7
#define COLUMN_EXTRA 8 #define COLUMN_LATENCY 8
#define COLUMN_VOICE 9 #define COLUMN_VOICE 9
#define COLUMN_BLANK 10 #define COLUMN_BLANK 10
#define NUM_COLUMNS 11 #define NUM_COLUMNS 11