X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_onslaught.qc;fp=qcsrc%2Fserver%2Fmutators%2Fgamemode_onslaught.qc;h=09641ff203576e796e0bda1646f0060b334d56b7;hb=c3f6bc06517a43e4de33d2a9148cdb36dbfc2ab8;hp=dc2398609f1d08e821514e7bd6b51ceaf813a871;hpb=f65d6c4047bfc05f465e3cf2878de9f368b66bad;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/gamemode_onslaught.qc b/qcsrc/server/mutators/gamemode_onslaught.qc
index dc2398609..09641ff20 100644
--- a/qcsrc/server/mutators/gamemode_onslaught.qc
+++ b/qcsrc/server/mutators/gamemode_onslaught.qc
@@ -1658,6 +1658,29 @@ MUTATOR_HOOKFUNCTION(ons_PlayerSpawn)
     return 0;
 }
 
+MUTATOR_HOOKFUNCTION(ons_TurretSpawn)
+{
+	entity e, ee = world;
+	if(self.targetname)
+	{
+		e = find(world, target, self.targetname);
+
+		if(e != world)
+		{
+			self.team = e.team;
+			ee = e;
+		}
+	}
+	
+	if(ee)
+	{
+		activator = ee;
+		self.use();
+	}
+
+	return FALSE;
+}
+
 MUTATOR_HOOKFUNCTION(ons_MonsterThink)
 {
 	entity e = find(world, targetname, self.target);
@@ -1674,15 +1697,6 @@ MUTATOR_HOOKFUNCTION(ons_MonsterSpawn)
 	if(self.targetname)
 	{
 		e = find(world,target,self.targetname);
-		if(e != world)
-		{
-			self.team = e.team;
-			ee = e;
-		}
-	}
-	
-	if(ee)
-	{
         activator = ee;
         self.use();
     }
@@ -1695,6 +1709,7 @@ MUTATOR_DEFINITION(gamemode_onslaught)
 	MUTATOR_HOOK(BuildMutatorsPrettyString, ons_BuildMutatorsPrettyString, CBC_ORDER_ANY);
 	MUTATOR_HOOK(BuildMutatorsString, ons_BuildMutatorsString, CBC_ORDER_ANY);
 	MUTATOR_HOOK(PlayerSpawn, ons_PlayerSpawn, CBC_ORDER_ANY);
+	MUTATOR_HOOK(TurretSpawn, ons_TurretSpawn, CBC_ORDER_ANY);
 	MUTATOR_HOOK(MonsterMove, ons_MonsterThink, CBC_ORDER_ANY);
 	MUTATOR_HOOK(MonsterSpawn, ons_MonsterSpawn, CBC_ORDER_ANY);
 	//MUTATOR_HOOK(Spawn_Score, ons_Spawn_Score, CBC_ORDER_ANY);