From 8caacb91e745b786271784120466294e6e62d7eb Mon Sep 17 00:00:00 2001
From: blub0 <blub0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Thu, 7 Aug 2008 08:20:42 +0000
Subject: [PATCH] some cleanup, and removed the SVN revision table for
 CSQC_REVISION since it's not been updated... might go through the revisions
 some time to build a new table if necessary/wanted

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4047 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/client/Main.qc          | 10 ----------
 data/qcsrc/client/mapvoting.qc     |  1 -
 data/qcsrc/client/miscfunctions.qc |  2 +-
 data/qcsrc/client/sbar.qc          | 12 ++----------
 data/qcsrc/client/sortlist.qc      |  7 +++++--
 5 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/data/qcsrc/client/Main.qc b/data/qcsrc/client/Main.qc
index 509b8d408..756985e09 100644
--- a/data/qcsrc/client/Main.qc
+++ b/data/qcsrc/client/Main.qc
@@ -607,13 +607,6 @@ float CSQC_Parse_TempEntity()
 	return bHandled;
 }
 
-// COMMIT-TODO: Update if necessare, before committing
-float csqc_svn_map[CSQC_REVISION] =
-{
-	3812, // 3795,
-	3820 // mapvote protocol changed from there
-};
-
 // COMMIT-TODO: Update if necessare, before committing
 void CSQC_CheckRevision()
 {
@@ -622,9 +615,6 @@ void CSQC_CheckRevision()
 		print("^2SVQC and CSQC revisions are compatible.\n");
 	} else if(csqc_revision < CSQC_REVISION) {
 		print("^1Your csprogs.dat (CSQC) version is newer than the one on the server.\n");
-		print("^1The last known svn revision for the server's CSQC is: ^7");
-		print(ftos(csqc_svn_map[csqc_revision])); // don't use strcat, fteqcc loves screwing up arrays...
-		print("\n");
 	} else if(csqc_revision > CSQC_REVISION) {
 		print("^1Your csprogs.dat (CSQC) is too old for this server.\n");
 		print("^1Please update to a newer version.\n");
diff --git a/data/qcsrc/client/mapvoting.qc b/data/qcsrc/client/mapvoting.qc
index 082e42e80..62c69f606 100644
--- a/data/qcsrc/client/mapvoting.qc
+++ b/data/qcsrc/client/mapvoting.qc
@@ -77,7 +77,6 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin
 
 void MapVote_DrawAbstain(vector pos, float isize, float tsize, float count, float id)
 {
-	vector img_size;
 	vector rgb;
 	float text_size;
 	string label;
diff --git a/data/qcsrc/client/miscfunctions.qc b/data/qcsrc/client/miscfunctions.qc
index 37df4aab1..fc0061382 100644
--- a/data/qcsrc/client/miscfunctions.qc
+++ b/data/qcsrc/client/miscfunctions.qc
@@ -27,7 +27,7 @@ void RemovePlayer(entity player)
 
 	if(!pl)
 	{
-		print("Trying to remove a player which is not in the playerlist!");
+		error("Trying to remove a player which is not in the playerlist!");
 		return;
 	}
 	parent.sort_next = player.sort_next;
diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 09a1c5691..abc9f4ead 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -8,15 +8,7 @@ float sb_lines; // still don't know what to do with that NOTE: check dp's sbar.c
 vector sbar;
 float sbar_alpha_fg;
 float sbar_hudselector;
-/*
-entity sortedPlayers;
-entity sortedTeams;
-
-.float sb_frags;
-.float sb_team;
-.float sb_player;
-.float sb_caps;
-*/
+
 float ps_primary, ps_secondary;
 float ts_primary, ts_secondary;
 
@@ -131,7 +123,7 @@ void Sbar_DrawXNum (vector pos, float num, float digits, float lettersize, vecto
 void Cmd_Sbar_SetFields(float argc);
 void Sbar_InitScores()
 {
-	float i, f, primary_prio, secondary_prio;
+	float i, f;
 
 	ps_primary = ps_secondary = ts_primary = ts_secondary = -1;
 	for(i = 0; i < MAX_SCORE; ++i)
diff --git a/data/qcsrc/client/sortlist.qc b/data/qcsrc/client/sortlist.qc
index 3f0a51ab6..9bf6cc84b 100644
--- a/data/qcsrc/client/sortlist.qc
+++ b/data/qcsrc/client/sortlist.qc
@@ -1,4 +1,4 @@
-.float(entity,entity) sort_cmp;
+//.float(entity,entity) sort_cmp;
 .entity sort_next, sort_prev;
 
 entity Sort_Spawn()
@@ -9,7 +9,7 @@ entity Sort_Spawn()
 	sort.chain = sort;
 	return sort;
 }
-
+/*
 entity Sort_New(float(entity,entity) cmp)
 {
 	entity sort;
@@ -96,6 +96,7 @@ entity Sort_Get(entity sort, float i)
 		sort = sort.sort_next;
 	return sort;
 }
+*/
 
 /**
  * Swap two neighbours in a sortlist.
@@ -110,6 +111,7 @@ entity Sort_Get(entity sort, float i)
 	a.sort_prev = b;									\
 	b.sort_next = a
 
+/*
 void Sort_Erase(entity ent)
 {
 	ent.sort_prev.sort_next = ent.sort_next;
@@ -130,3 +132,4 @@ void Sort_RemoveOld(entity sort)
 		}
 	}
 }
+*/
-- 
2.39.2