Merge branch 'TimePath/globalforces' into 'master'

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

diff --git a/qcsrc/common/turrets/turret/phaser.qc b/qcsrc/common/turrets/turret/phaser.qc
index 24a476c03223127a6c43a581f727c8fd7bf70fd4..7c5d336212694b662262ee9da99372b2857d6ace 100644 (file)
--- a/qcsrc/common/turrets/turret/phaser.qc
+++ b/qcsrc/common/turrets/turret/phaser.qc
@@ -1,7 +1,7 @@
 #ifndef TURRET_PHASER_H
 #define TURRET_PHASER_H
 
-#include "phaser_weapon.qc"
+#include "phaser_weapon.qh"
 
 CLASS(PhaserTurret, Turret)
 /* spawnflags */ ATTRIB(PhaserTurret, spawnflags, int, TUR_FLAG_SNIPER | TUR_FLAG_HITSCAN | TUR_FLAG_PLAYER);
@@ -20,35 +20,35 @@ REGISTER_TURRET(PHASER, NEW(PhaserTurret));
 
 #ifdef IMPLEMENTATION
 
-#include "phaser_weapon.qc"
-
 #ifdef SVQC
 
-spawnfunc(turret_phaser) { if (!turret_initialize(TUR_PHASER)) remove(self); }
+spawnfunc(turret_phaser) { if (!turret_initialize(this, TUR_PHASER)) delete(this); }
+
+.int fireflag;
 
-METHOD(PhaserTurret, tr_think, void(PhaserTurret thistur))
+METHOD(PhaserTurret, tr_think, void(PhaserTurret thistur, entity it))
 {
-    if (self.tur_head.frame != 0)
+    if (it.tur_head.frame != 0)
     {
-        if (self.fireflag == 1)
+        if (it.fireflag == 1)
         {
-            if (self.tur_head.frame == 10)
-                self.tur_head.frame = 1;
+            if (it.tur_head.frame == 10)
+                it.tur_head.frame = 1;
             else
-                self.tur_head.frame = self.tur_head.frame +1;
+                it.tur_head.frame = it.tur_head.frame +1;
         }
-        else if (self.fireflag == 2 )
+        else if (it.fireflag == 2 )
         {
-            self.tur_head.frame = self.tur_head.frame +1;
-            if (self.tur_head.frame == 15)
+            it.tur_head.frame = it.tur_head.frame +1;
+            if (it.tur_head.frame == 15)
             {
-                self.tur_head.frame = 0;
-                self.fireflag = 0;
+                it.tur_head.frame = 0;
+                it.fireflag = 0;
             }
         }
     }
 }
-float turret_phaser_firecheck();
+bool turret_phaser_firecheck(entity this);
 METHOD(PhaserTurret, tr_setup, void(PhaserTurret this, entity it))
 {
     it.ammo_flags = TFL_AMMO_ENERGY | TFL_AMMO_RECHARGE | TFL_AMMO_RECIEVE;
@@ -56,11 +56,10 @@ METHOD(PhaserTurret, tr_setup, void(PhaserTurret this, entity it))
 
     it.turret_firecheckfunc = turret_phaser_firecheck;
 }
-float turret_phaser_firecheck()
+bool turret_phaser_firecheck(entity this)
 {
-    SELFPARAM();
-    if (self.fireflag != 0) return 0;
-    return turret_firecheck();
+    if (this.fireflag != 0) return false;
+    return turret_firecheck(this);
 }
 
 #endif