Merge branch 'master' into Mario/turrets

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / gamemode_onslaught.qc

diff --git a/qcsrc/server/mutators/gamemode_onslaught.qc b/qcsrc/server/mutators/gamemode_onslaught.qc
index 4f33719bbde2d8b274fea9251bc32f333f6367d7..9ad119166dd6b15374b5c327e2449beb944b43e6 100644 (file)
--- a/qcsrc/server/mutators/gamemode_onslaught.qc
+++ b/qcsrc/server/mutators/gamemode_onslaught.qc
@@ -1333,7 +1333,7 @@ void onslaught_controlpoint_reset()
 
        activator = self;
        SUB_UseTargets(); // to reset the structures, playerspawns etc.
-       
+
        CSQCMODEL_AUTOUPDATE();
 }
 
@@ -1405,7 +1405,7 @@ void spawnfunc_onslaught_controlpoint()
        self.enemy.colormap = self.colormap;
 
        waypoint_spawnforitem(self);
-       
+
        self.think = onslaught_controlpoint_think;
        self.nextthink = time;
 
@@ -1415,7 +1415,7 @@ void spawnfunc_onslaught_controlpoint()
        onslaught_updatelinks();
 
        self.reset = onslaught_controlpoint_reset;
-       
+
        CSQCMODEL_AUTOINIT();
 }
 
@@ -1657,6 +1657,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);
@@ -1669,19 +1692,10 @@ MUTATOR_HOOKFUNCTION(ons_MonsterThink)
 MUTATOR_HOOKFUNCTION(ons_MonsterSpawn)
 {
        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();
     }
@@ -1694,6 +1708,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);