Kill off some now useless WITHSELF cases

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

diff --git a/qcsrc/common/turrets/util.qc b/qcsrc/common/turrets/util.qc
index 0344d149230461e0ca97b3db210de93bf7441e3a..41e7cd491ce7d8fb1456b0511b65d08418e4123a 100644 (file)
--- a/qcsrc/common/turrets/util.qc
+++ b/qcsrc/common/turrets/util.qc
@@ -1,17 +1,17 @@
 /*
-* Update self.tur_shotorg by getting up2date bone info
+* Update this.tur_shotorg by getting up2date bone info
 * NOTICE this func overwrites the global v_forward, v_right and v_up vectors.
 */
-float turret_tag_fire_update()
-{SELFPARAM();
-       if(!self.tur_head)
+float turret_tag_fire_update(entity this)
+{
+       if(!this.tur_head)
        {
-               error("Call to turret_tag_fire_update with self.tur_head missing!\n");
-               self.tur_shotorg = '0 0 0';
+               LOG_DEBUG("Call to turret_tag_fire_update with this.tur_head missing!\n");
+               this.tur_shotorg = '0 0 0';
                return false;
        }
 
-       self.tur_shotorg = gettaginfo(self.tur_head, gettagindex(self.tur_head, "tag_fire"));
+       this.tur_shotorg = gettaginfo(this.tur_head, gettagindex(this.tur_head, "tag_fire"));
        v_forward = normalize(v_forward);
 
        return true;
@@ -93,21 +93,21 @@ void FireImoBeam(entity this, vector start, vector end, vector smin, vector smax
 }
 
 #ifdef TURRET_DEBUG
-void marker_think()
-{SELFPARAM();
-       if(self.cnt)
-       if(self.cnt < time)
+void marker_think(entity this, )
+{
+       if(this.cnt)
+       if(this.cnt < time)
        {
-               setthink(self, SUB_Remove);
-               self.nextthink = time;
+               setthink(this, SUB_Remove);
+               this.nextthink = time;
                return;
        }
 
-       self.frame += 1;
-       if(self.frame > 29)
-               self.frame = 0;
+       this.frame += 1;
+       if(this.frame > 29)
+               this.frame = 0;
 
-       self.nextthink = time;
+       this.nextthink = time;
 }
 
 void mark_error(vector where,float lifetime)