From: Mario <mario.mario@y7mail.com>
Date: Sat, 26 Jan 2013 09:57:08 +0000 (+1100)
Subject: Remove turrets that weren't spawned by a player
X-Git-Tag: xonotic-v0.8.0~241^2^2~561
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fa1d16be7fbb5ff504da05c9adc53c5bd76ce0c5;p=xonotic%2Fxonotic-data.pk3dir.git

Remove turrets that weren't spawned by a player
---

diff --git a/qcsrc/server/mutators/gamemode_td.qc b/qcsrc/server/mutators/gamemode_td.qc
index a1b4550f7..4d4276c05 100644
--- a/qcsrc/server/mutators/gamemode_td.qc
+++ b/qcsrc/server/mutators/gamemode_td.qc
@@ -915,6 +915,9 @@ MUTATOR_HOOKFUNCTION(td_SetStartItems)
 
 MUTATOR_HOOKFUNCTION(td_TurretSpawn)
 {
+	if(self.realowner == world)
+		return TRUE; // wasn't spawned by a player
+		
 	self.bot_attack = FALSE;
 	self.turret_buff = 1;
 	
@@ -1048,7 +1051,7 @@ MUTATOR_DEFINITION(gamemode_td)
 		if(time > 1) // game loads at time 1
 			error("This is a game type and it cannot be added at runtime.");	
 		cvar_settemp("g_monsters", "1");
-		cvar_settemp("g_turrets", "1"); // TODO: disable mapper added turrets?
+		cvar_settemp("g_turrets", "1");
 		td_Init();
 	}