r3592 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-04-22 04:34:11 -0400 (Tue, 22 Apr 2008)
New Revision: 3592

Modified:
   trunk/data/qcsrc/server/ctf.qc
   trunk/data/qcsrc/server/domination.qc
Log:
fix CTF and Domination leaving bogus entities around when the mode is not used
(game type specific entities should always remove(self) when that game type is not played)


Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc	2008-04-21 09:00:29 UTC (rev 3591)
+++ trunk/data/qcsrc/server/ctf.qc	2008-04-22 08:34:11 UTC (rev 3592)
@@ -460,7 +460,10 @@
 void() item_flag_team1 =
 {
 	if (!g_ctf)
+	{
+		remove(self);
 		return;
+	}
 
 	//if(!cvar("teamplay"))
 	//	cvar_set("teamplay", "3");
@@ -526,7 +529,10 @@
 void() item_flag_team2 =
 {
 	if (!g_ctf)
+	{
+		remove(self);
 		return;
+	}
 	//if(!cvar("teamplay"))
 	//	cvar_set("teamplay", "3");
 
@@ -595,6 +601,11 @@
 
 void() ctf_team =
 {
+	if (!g_ctf)
+	{
+		remove(self);
+		return;
+	}
 	self.classname = "ctf_team";
 	self.team = self.cnt + 1;
 };

Modified: trunk/data/qcsrc/server/domination.qc
===================================================================
--- trunk/data/qcsrc/server/domination.qc	2008-04-21 09:00:29 UTC (rev 3591)
+++ trunk/data/qcsrc/server/domination.qc	2008-04-22 08:34:11 UTC (rev 3592)
@@ -229,6 +229,11 @@
 
 void() dom_team =
 {
+	if(!g_domination)
+	{
+		remove(self);
+		return;
+	}
 	precache_model(self.model);
 	if (self.noise != "")
 		precache_sound(self.noise);