diff --git a/releases/3.2.0/Balance.txt b/releases/3.2.0/Balance.txt index 44274a0e..db82c2f1 100644 --- a/releases/3.2.0/Balance.txt +++ b/releases/3.2.0/Balance.txt @@ -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 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 1e63fccf..4d06dd51 100644 --- a/releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp +++ b/releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp @@ -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 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); }