Merge branch 'master' into TimePath/unified_weapons

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / targettrigger.qc

diff --git a/qcsrc/common/turrets/targettrigger.qc b/qcsrc/common/turrets/targettrigger.qc
index 65510645b130a9d5968cd7bee6fa273fd5e1d152..625746341750754f0f6336550a1eff867aaf1430 100644 (file)
--- a/qcsrc/common/turrets/targettrigger.qc
+++ b/qcsrc/common/turrets/targettrigger.qc
@@ -1,19 +1,18 @@
-void spawnfunc_turret_targettrigger();
+spawnfunc(turret_targettrigger);
 void turret_targettrigger_touch();
 
 void turret_targettrigger_touch()
-{
+{SELFPARAM();
     entity e;
     if (self.cnt > time) return;
-    entity oldself;
-    oldself = self;
+    entity oldself = this;
 
     e = find(world, targetname, self.target);
     while (e)
     {
         if (e.turret_flags & TUR_FLAG_RECIEVETARGETS)
         {
-            self = e;
+            setself(e);
             if(e.turret_addtarget)
                 e.turret_addtarget(other,oldself);
         }
@@ -23,12 +22,12 @@ void turret_targettrigger_touch()
 
     oldself.cnt = time + 0.5;
 
-    self = oldself;
+    setself(this);
 }
 
 /*QUAKED turret_targettrigger (.5 .5 .5) ?
 */
-void spawnfunc_turret_targettrigger()
+spawnfunc(turret_targettrigger)
 {
     if(!autocvar_g_turrets) { remove(self); return; }