Give W_SetupShot a deathtype parameter, fixes some ugly hacks

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

diff --git a/qcsrc/common/turrets/checkpoint.qc b/qcsrc/common/turrets/checkpoint.qc
index 669414c570a6215b0945ec4cf59003bf909b262f..f5ba71477982d4ec6b727d1312aaf36633269a1c 100644 (file)
--- a/qcsrc/common/turrets/checkpoint.qc
+++ b/qcsrc/common/turrets/checkpoint.qc
@@ -1,3 +1,7 @@
+#include "checkpoint.qh"
+
+#ifdef SVQC
+
 /**
     turret_checkpoint
 **/
@@ -11,19 +15,13 @@
 #define checkpoint_cache_to   selected_player
 */
 
-.entity pathgoal;
-
 /*
 entity path_makeorcache(entity forwho,entity start, entity end)
 {
-    entity oldself;
     entity pth;
-    oldself = self;
-    self = forwho;
 
-    //pth = pathlib_makepath(start.origin,end.origin,PFL_GROUNDSNAP,500,1.5,PT_QUICKSTAR);
+    //pth = pathlib_makepath(forwho, start.origin,end.origin,PFL_GROUNDSNAP,500,1.5,PT_QUICKSTAR);
 
-    self = oldself;
     return pth;
 }
 */
@@ -33,12 +31,12 @@ void turret_checkpoint_use()
 }
 
 #if 0
-void turret_checkpoint_think()
-{SELFPARAM();
-    if(self.enemy)
-        te_lightning1(self,self.origin, self.enemy.origin);
+void turret_checkpoint_think(entity this)
+{
+    if(this.enemy)
+        te_lightning1(this,this.origin, this.enemy.origin);
 
-    self.nextthink = time + 0.25;
+    this.nextthink = time + 0.25;
 }
 #endif
 /*QUAKED turret_checkpoint (1 0 1) (-32 -32 -32) (32 32 32)
@@ -51,26 +49,26 @@ If a loop is of targets are formed, any unit entering this loop will patrol it i
 If the checkpoint chain in not looped, the unit will go "Roaming" when the last point is reached.
 */
 //float tc_acum;
-void turret_checkpoint_init()
-{SELFPARAM();
-    traceline(self.origin + '0 0 16', self.origin - '0 0 1024', MOVE_WORLDONLY, self);
-    setorigin(self, trace_endpos + '0 0 32');
+void turret_checkpoint_init(entity this)
+{
+    traceline(this.origin + '0 0 16', this.origin - '0 0 1024', MOVE_WORLDONLY, this);
+    setorigin(this, trace_endpos + '0 0 32');
 
-    if(self.target != "")
+    if(this.target != "")
     {
-        self.enemy = find(world, targetname, self.target);
-        if(self.enemy == world)
-            LOG_TRACE("A turret_checkpoint faild to find its target!\n");
+        this.enemy = find(NULL, targetname, this.target);
+        if(this.enemy == NULL)
+            LOG_TRACE("A turret_checkpoint faild to find its target!");
     }
-    //self.think = turret_checkpoint_think;
-    //self.nextthink = time + tc_acum + 0.25;
+    //setthink(this, turret_checkpoint_think);
+    //this.nextthink = time + tc_acum + 0.25;
     //tc_acum += 0.25;
 }
 
 spawnfunc(turret_checkpoint)
 {
-    setorigin(this,this.origin);
-    this.think = turret_checkpoint_init;
+    setorigin(this, this.origin);
+    setthink(this, turret_checkpoint_init);
     this.nextthink = time + 0.2;
 }
 
@@ -80,3 +78,5 @@ spawnfunc(walker_checkpoint)
     this.classname = "turret_checkpoint";
     spawnfunc_turret_checkpoint(this);
 }
+
+#endif