From 8f861f40f896bbf090c2ba6ccb61cb3ffcfe5638 Mon Sep 17 00:00:00 2001
From: puzl <puzl@67975925-1194-0748-b3d5-c16f83f1a3a1>
Date: Wed, 3 May 2006 01:12:17 +0000
Subject: [PATCH] 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
---
 releases/3.2.0/Balance.txt                    |  2 +-
 .../3.2.0/source/cl_dll/vgui_ScorePanel.cpp   | 21 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

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<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);
 }