Add attacker parameter to PlayHitsound

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

diff --git a/qcsrc/common/turrets/turret/fusionreactor.qc b/qcsrc/common/turrets/turret/fusionreactor.qc
index dbd74e42462bac263c158a23ce8f6a79f42c9812..47bff24f1a9e063661ab21e75eb5c14b528b1cd6 100644 (file)
--- a/qcsrc/common/turrets/turret/fusionreactor.qc
+++ b/qcsrc/common/turrets/turret/fusionreactor.qc
@@ -1,105 +1,77 @@
-#ifndef TUR_FUSIONREACTOR_H
-#define TUR_FUSIONREACTOR_H
+#ifndef TURRET_FUSIONREACTOR_H
+#define TURRET_FUSIONREACTOR_H
 
 CLASS(FusionReactor, Turret)
 /* spawnflags */ ATTRIB(FusionReactor, spawnflags, int, TUR_FLAG_SUPPORT | TUR_FLAG_AMMOSOURCE);
 /* mins       */ ATTRIB(FusionReactor, mins, vector, '-34 -34 0');
 /* maxs       */ ATTRIB(FusionReactor, maxs, vector, '34 34 90');
 /* modelname  */ ATTRIB(FusionReactor, mdl, string, "base.md3");
-/* model      */ ATTRIB(FusionReactor, model, string, strzone(strcat("models/turrets/", this.mdl)));
-/* head_model */ ATTRIB(FusionReactor, head_model, string, strzone(strcat("models/turrets/", "reactor.md3")));
-/* netname    */ ATTRIB(FusionReactor, netname, string, "fusionreactor");
+/* model      */ ATTRIB_STRZONE(FusionReactor, model, string, strcat("models/turrets/", this.mdl));
+/* head_model */ ATTRIB_STRZONE(FusionReactor, head_model, string, strcat("models/turrets/", "reactor.md3"));
+/* netname    */ ATTRIB(FusionReactor, netname, string, "fusreac");
 /* fullname   */ ATTRIB(FusionReactor, turret_name, string, _("Fusion Reactor"));
 ENDCLASS(FusionReactor)
-
 REGISTER_TURRET(FUSIONREACTOR, NEW(FusionReactor));
 
 #endif
 
 #ifdef IMPLEMENTATION
 #ifdef SVQC
-bool turret_fusionreactor_firecheck()
-{SELFPARAM();
-    if (self.attack_finished_single > time)
+bool turret_fusionreactor_firecheck(entity this)
+{
+    if (this.attack_finished_single[0] > time)
         return false;
 
-    if (self.enemy.deadflag != DEAD_NO)
+    if (IS_DEAD(this.enemy))
         return false;
 
-    if (self.enemy == world)
+    if (this.enemy == NULL)
         return false;
 
-    if (self.ammo < self.shot_dmg)
+    if (this.ammo < this.shot_dmg)
         return false;
 
-    if (self.enemy.ammo >= self.enemy.ammo_max)
+    if (this.enemy.ammo >= this.enemy.ammo_max)
         return false;
 
-    if (vlen(self.enemy.origin - self.origin) > self.target_range)
+    if(vdist(this.enemy.origin - this.origin, >, this.target_range))
         return false;
 
-    if(self.team != self.enemy.team)
+    if(this.team != this.enemy.team)
         return false;
 
-    if(!(self.enemy.ammo_flags & TFL_AMMO_ENERGY))
+    if(!(this.enemy.ammo_flags & TFL_AMMO_ENERGY))
         return false;
 
     return true;
 }
 
-void spawnfunc_turret_fusionreactor() { SELFPARAM(); if(!turret_initialize(TUR_FUSIONREACTOR.m_id)) remove(self); }
-
-        METHOD(FusionReactor, tr_attack, bool(FusionReactor thistur))
-        {
-            vector fl_org;
-
-            self.enemy.ammo = min(self.enemy.ammo + self.shot_dmg,self.enemy.ammo_max);
-            fl_org = 0.5 * (self.enemy.absmin + self.enemy.absmax);
-            te_smallflash(fl_org);
-
-            return true;
-        }
-        METHOD(FusionReactor, tr_think, bool(FusionReactor thistur))
-        {
-            self.tur_head.avelocity = '0 250 0' * (self.ammo / self.ammo_max);
-
-            return true;
-        }
-        METHOD(FusionReactor, tr_death, bool(FusionReactor thistur))
-        {
-            return true;
-        }
-        METHOD(FusionReactor, tr_setup, bool(FusionReactor thistur))
-        {
-            self.ammo_flags                            = TFL_AMMO_ENERGY | TFL_AMMO_RECHARGE;
-            self.target_select_flags   = TFL_TARGETSELECT_TEAMCHECK | TFL_TARGETSELECT_OWNTEAM | TFL_TARGETSELECT_RANGELIMITS;
-            self.firecheck_flags               = TFL_FIRECHECK_AMMO_OWN | TFL_FIRECHECK_AMMO_OTHER | TFL_FIRECHECK_DISTANCES | TFL_FIRECHECK_DEAD;
-            self.shoot_flags                   = TFL_SHOOT_HITALLVALID;
-            self.aim_flags                             = TFL_AIM_NO;
-            self.track_flags                   = TFL_TRACK_NO;
-
-            self.tur_head.scale = 0.75;
-            self.tur_head.avelocity = '0 50 0';
-
-            self.turret_firecheckfunc = turret_fusionreactor_firecheck;
-
-            return true;
-        }
-        METHOD(FusionReactor, tr_precache, bool(FusionReactor thistur))
-        {
-            return true;
-        }
-
-#endif // SVQC
-#ifdef CSQC
-        METHOD(FusionReactor, tr_setup, bool(FusionReactor thistur))
-        {
-            return true;
-        }
-        METHOD(FusionReactor, tr_precache, bool(FusionReactor thistur))
-        {
-            return true;
-        }
-
-#endif // CSQC
-#endif // REGISTER_TURRET
+spawnfunc(turret_fusionreactor) { if (!turret_initialize(this, TUR_FUSIONREACTOR)) delete(this); }
+
+METHOD(FusionReactor, tr_attack, void(FusionReactor this, entity it))
+{
+    it.enemy.ammo = min(it.enemy.ammo + it.shot_dmg,it.enemy.ammo_max);
+    vector fl_org = 0.5 * (it.enemy.absmin + it.enemy.absmax);
+    te_smallflash(fl_org);
+}
+METHOD(FusionReactor, tr_think, void(FusionReactor thistur, entity it))
+{
+    it.tur_head.avelocity = '0 250 0' * (it.ammo / it.ammo_max);
+}
+METHOD(FusionReactor, tr_setup, void(FusionReactor this, entity it))
+{
+    it.ammo_flags                              = TFL_AMMO_ENERGY | TFL_AMMO_RECHARGE;
+    it.target_select_flags     = TFL_TARGETSELECT_TEAMCHECK | TFL_TARGETSELECT_OWNTEAM | TFL_TARGETSELECT_RANGELIMITS;
+    it.firecheck_flags         = TFL_FIRECHECK_AMMO_OWN | TFL_FIRECHECK_AMMO_OTHER | TFL_FIRECHECK_DISTANCES | TFL_FIRECHECK_DEAD;
+    it.shoot_flags                     = TFL_SHOOT_HITALLVALID;
+    it.aim_flags                               = TFL_AIM_NO;
+    it.track_flags                     = TFL_TRACK_NO;
+
+    it.tur_head.scale = 0.75;
+    it.tur_head.avelocity = '0 50 0';
+
+    it.turret_firecheckfunc = turret_fusionreactor_firecheck;
+}
+
+#endif
+#endif