From 2eb8a452079e3cac2371062cb5e7e3fbeb29b58f Mon Sep 17 00:00:00 2001
From: puzl <puzl@67975925-1194-0748-b3d5-c16f83f1a3a1>
Date: Thu, 20 Apr 2006 19:18:42 +0000
Subject: [PATCH] o Added per team column titles for Info - Weapon for marines,
 Res for aliens. o Moved the info column to be before score, so score, kills
 and deaths are together.  ( it also makes more room for 'Weapon' to display
 uncluttered

git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@402 67975925-1194-0748-b3d5-c16f83f1a3a1
---
 releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp |  9 +++++++++
 releases/3.2.0/source/cl_dll/vgui_ScorePanel.h   |  4 ++--
 releases/3.2.0/titles.txt                        | 10 ++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

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 b140d65..1e63fcc 100644
--- a/releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp
+++ b/releases/3.2.0/source/cl_dll/vgui_ScorePanel.cpp
@@ -737,6 +737,15 @@ void ScorePanel::FillGrid()
 	}
 	
 	bool bNextRowIsGap = false;
+	if ( gHUD.GetIsMarine() ) {
+		m_HeaderLabels[COLUMN_EXTRA].setText(CHudTextMessage::BufferedLocaliseTextString("#COLWEAP"));
+	}
+	else if ( gHUD.GetIsAlien() ) { 
+		m_HeaderLabels[COLUMN_EXTRA].setText(CHudTextMessage::BufferedLocaliseTextString("#COLRES"));
+	}
+	else {
+		m_HeaderLabels[COLUMN_EXTRA].setText(CHudTextMessage::BufferedLocaliseTextString("#EXTRA"));
+	}
 	
 	for(int row=0; row < NUM_ROWS; row++)
 	{
diff --git a/releases/3.2.0/source/cl_dll/vgui_ScorePanel.h b/releases/3.2.0/source/cl_dll/vgui_ScorePanel.h
index eebeac0..7ed6130 100644
--- a/releases/3.2.0/source/cl_dll/vgui_ScorePanel.h
+++ b/releases/3.2.0/source/cl_dll/vgui_ScorePanel.h
@@ -20,8 +20,8 @@
 #define COLUMN_RANK_ICON	1
 #define COLUMN_NAME			2
 #define COLUMN_CLASS		3
-#define COLUMN_SCORE        4
-#define COLUMN_EXTRA	    5
+#define COLUMN_EXTRA	    4
+#define COLUMN_SCORE        5
 #define COLUMN_KILLS        6
 #define COLUMN_DEATHS		7
 #define COLUMN_LATENCY		8
diff --git a/releases/3.2.0/titles.txt b/releases/3.2.0/titles.txt
index f27e688..f15c257 100644
--- a/releases/3.2.0/titles.txt
+++ b/releases/3.2.0/titles.txt
@@ -376,6 +376,16 @@ EXTRA
 Info
 }
 
+COLWEAP
+{
+Weapon
+}
+
+COLRES
+{
+Res
+}
+
 DEATHS
 {
 Deaths