r4047 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: blub0
Date: 2008-08-07 04:20:42 -0400 (Thu, 07 Aug 2008)
New Revision: 4047

Modified:
   trunk/data/qcsrc/client/Main.qc
   trunk/data/qcsrc/client/mapvoting.qc
   trunk/data/qcsrc/client/miscfunctions.qc
   trunk/data/qcsrc/client/sbar.qc
   trunk/data/qcsrc/client/sortlist.qc
Log:
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

Modified: trunk/data/qcsrc/client/Main.qc
===================================================================
--- trunk/data/qcsrc/client/Main.qc	2008-08-06 19:13:41 UTC (rev 4046)
+++ trunk/data/qcsrc/client/Main.qc	2008-08-07 08:20:42 UTC (rev 4047)
@@ -608,13 +608,6 @@
 }
 
 // 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()
 {
 	if(csqc_revision == CSQC_REVISION)
@@ -622,9 +615,6 @@
 		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");

Modified: trunk/data/qcsrc/client/mapvoting.qc
===================================================================
--- trunk/data/qcsrc/client/mapvoting.qc	2008-08-06 19:13:41 UTC (rev 4046)
+++ trunk/data/qcsrc/client/mapvoting.qc	2008-08-07 08:20:42 UTC (rev 4047)
@@ -77,7 +77,6 @@
 
 void MapVote_DrawAbstain(vector pos, float isize, float tsize, float count, float id)
 {
-	vector img_size;
 	vector rgb;
 	float text_size;
 	string label;

Modified: trunk/data/qcsrc/client/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/client/miscfunctions.qc	2008-08-06 19:13:41 UTC (rev 4046)
+++ trunk/data/qcsrc/client/miscfunctions.qc	2008-08-07 08:20:42 UTC (rev 4047)
@@ -27,7 +27,7 @@
 
 	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;

Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2008-08-06 19:13:41 UTC (rev 4046)
+++ trunk/data/qcsrc/client/sbar.qc	2008-08-07 08:20:42 UTC (rev 4047)
@@ -8,15 +8,7 @@
 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 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)

Modified: trunk/data/qcsrc/client/sortlist.qc
===================================================================
--- trunk/data/qcsrc/client/sortlist.qc	2008-08-06 19:13:41 UTC (rev 4046)
+++ trunk/data/qcsrc/client/sortlist.qc	2008-08-07 08:20:42 UTC (rev 4047)
@@ -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 @@
 	sort.chain = sort;
 	return sort;
 }
-
+/*
 entity Sort_New(float(entity,entity) cmp)
 {
 	entity sort;
@@ -96,6 +96,7 @@
 		sort = sort.sort_next;
 	return sort;
 }
+*/
 
 /**
  * Swap two neighbours in a sortlist.
@@ -110,6 +111,7 @@
 	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 @@
 		}
 	}
 }
+*/