From: Samual <samual@xonotic.org>
Date: Mon, 2 Apr 2012 15:34:00 +0000 (-0400)
Subject: Remove deprecated CTF code in cl_client.qc and teamplay.qc
X-Git-Tag: xonotic-v0.7.0~240^2~93
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=743471e58c3ba1d9717a330faad385ebb04f0955;p=xonotic%2Fxonotic-data.pk3dir.git

Remove deprecated CTF code in cl_client.qc and teamplay.qc
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 7a0210e42..10e4c1379 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -637,7 +637,6 @@ PutClientInServer
 Called when a client spawns in the server
 =============
 */
-//void() ctf_playerchanged;
 
 void PutClientInServer (void)
 {
@@ -921,9 +920,6 @@ void PutClientInServer (void)
 	} else if(self.classname == "observer") {
 		PutObserverInServer ();
 	}
-
-	//if(g_ctf)
-	//	ctf_playerchanged();
 }
 
 .float ebouncefactor, ebouncestop; // electro's values
@@ -1337,7 +1333,6 @@ ClientConnect
 Called when a client connects to the server
 =============
 */
-//void ctf_clientconnect();
 string ColoredTeamName(float t);
 void DecodeLevelParms (void);
 //void dom_player_join_team(entity pl);
@@ -1509,10 +1504,6 @@ void ClientConnect (void)
 		if(g_arena)
 			Spawnqueue_Insert(self);
 	}
-	/*else if(g_ctf)
-	{
-		ctf_clientconnect();
-	}*/
 
 	attach_entcs();
 
@@ -2536,7 +2527,6 @@ Called every frame for each client before the physics are run
 =============
 */
 .float usekeypressed;
-//void() ctf_setstatus;
 void() nexball_setstatus;
 .float items_added;
 void PlayerPreThink (void)
@@ -2834,9 +2824,6 @@ void PlayerPreThink (void)
 		if(frametime)
 			player_anim();
 
-		//if(g_ctf)
-		//	ctf_setstatus();
-
 		if(g_nexball)
 			nexball_setstatus();
 		
diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index de6fe352a..ce0e5c9c5 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -68,7 +68,6 @@ string TeamNoName(float t)
 }
 
 void dom_init();
-//void ctf_init();
 void runematch_init();
 void tdm_init();
 void entcs_init();
@@ -933,7 +932,6 @@ void SV_ChangeTeam(float _color)
 		if(self.deadflag == DEAD_NO)
 			Damage(self, self, self, 100000, DEATH_TEAMCHANGE, self.origin, '0 0 0');
 	}
-	//ctf_playerchanged();
 }
 
 void ShufflePlayerOutOfTeam (float source_team)