mirror of
https://github.com/ENSL/NS.git
synced 2025-03-21 01:41:29 +00:00
o Reduced pancaking some more.
o Scoreboard shows the player's team first. o Fixed a bug with column labeling on the scoreboard. git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@442 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
parent
d05ab49a2b
commit
8f861f40f8
2 changed files with 16 additions and 7 deletions
|
@ -405,7 +405,7 @@
|
|||
#define kJoinTeamCooldown 3.00
|
||||
#define kKNROF 0.65
|
||||
#define kLeapEnergyCost 0.25
|
||||
#define kLerkBaseAscendSpeedMax 600.00
|
||||
#define kLerkBaseAscendSpeedMax 530.0
|
||||
#define kLeapROF 0.50
|
||||
#define kMGROF 0.10
|
||||
#define kMarineArmorLevelOne 0.20
|
||||
|
|
|
@ -147,8 +147,8 @@ SBColumnInfo g_ColumnInfo[NUM_COLUMNS] =
|
|||
{NULL, 24, Label::a_east}, // status icons
|
||||
{NULL, 110, Label::a_east}, // name
|
||||
{NULL, 56, Label::a_east}, // class
|
||||
{"#SCORE", 40, Label::a_east}, // score
|
||||
{"#EXTRA", 40, Label::a_east}, // resources
|
||||
{"#SCORE", 40, Label::a_east}, // score
|
||||
{"#KILLS", 40, Label::a_east}, // kills
|
||||
{"#DEATHS", 40, Label::a_east}, // deaths
|
||||
{"#LATENCY", 40, Label::a_east}, // ping
|
||||
|
@ -529,11 +529,20 @@ void ScorePanel::SortTeams()
|
|||
g_TeamInfo[i].packetloss /= g_TeamInfo[i].players; // use the average ping of all the players in the team as the teams ping
|
||||
}
|
||||
}
|
||||
|
||||
SortActivePlayers(kMarine1Team);
|
||||
SortActivePlayers(kAlien1Team);
|
||||
SortActivePlayers(kMarine2Team);
|
||||
SortActivePlayers(kAlien2Team);
|
||||
vector<string> teams;
|
||||
if ( gHUD.GetIsAlien() ) {
|
||||
SortActivePlayers(kAlien1Team);
|
||||
SortActivePlayers(kMarine1Team);
|
||||
SortActivePlayers(kAlien2Team);
|
||||
SortActivePlayers(kMarine2Team);
|
||||
}
|
||||
else {
|
||||
SortActivePlayers(kMarine1Team);
|
||||
SortActivePlayers(kAlien1Team);
|
||||
SortActivePlayers(kMarine2Team);
|
||||
SortActivePlayers(kAlien2Team);
|
||||
}
|
||||
|
||||
SortActivePlayers(kSpectatorTeam);
|
||||
SortActivePlayers(kUndefinedTeam);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue