From: Mario <mario.mario@y7mail.com>
Date: Sun, 21 Apr 2013 00:47:23 +0000 (+1000)
Subject: Add monster support to ons
X-Git-Tag: xonotic-v0.8.0~241^2^2~329
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=be6230b67e8a3523ea238c4d99a129ec37886626;p=xonotic%2Fxonotic-data.pk3dir.git

Add monster support to ons
---

diff --git a/qcsrc/server/mutators/gamemode_onslaught.qc b/qcsrc/server/mutators/gamemode_onslaught.qc
index 27a34c5fe..e7793046f 100644
--- a/qcsrc/server/mutators/gamemode_onslaught.qc
+++ b/qcsrc/server/mutators/gamemode_onslaught.qc
@@ -1618,11 +1618,48 @@ MUTATOR_HOOKFUNCTION(ons_PlayerSpawn)
     return 0;
 }
 
+MUTATOR_HOOKFUNCTION(ons_MonsterThink)
+{
+	entity e = find(world, targetname, self.target);
+	if (e != world)
+		self.team = e.team;
+		
+	self.SendFlags |= MSF_STATUS; // update team
+
+	return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(ons_MonsterSpawn)
+{
+	entity e, ee = world;
+	
+	if(self.targetname)
+	{
+		e = find(world,target,self.targetname);
+		if(e != world)
+		{
+			self.team = e.team;
+			self.SendFlags |= MSF_STATUS;
+			ee = e;
+		}
+	}
+	
+	if(ee)
+	{
+        activator = ee;
+        self.use();
+    }
+
+	return FALSE;
+}
+
 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(MonsterMove, ons_MonsterThink, CBC_ORDER_ANY);
+	MUTATOR_HOOK(MonsterSpawn, ons_MonsterSpawn, CBC_ORDER_ANY);
 	//MUTATOR_HOOK(Spawn_Score, ons_Spawn_Score, CBC_ORDER_ANY);
 
 	MUTATOR_ONADD