Merge branch 'master' into terencehill/infomessages_panel_update

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

diff --git a/qcsrc/common/turrets/turret/mlrs.qc b/qcsrc/common/turrets/turret/mlrs.qc
index ae2d1d47ccc2a9753b43f260c19c5a6f5e2ef81b..bce27118a2ce34dc9ba605aa47d1adf78ea416c2 100644 (file)
--- a/qcsrc/common/turrets/turret/mlrs.qc
+++ b/qcsrc/common/turrets/turret/mlrs.qc
@@ -1,15 +1,15 @@
 #ifndef TURRET_MLRS_H
 #define TURRET_MLRS_H
 
-#include "mlrs_weapon.qc"
+#include "mlrs_weapon.qh"
 
 CLASS(MLRSTurret, Turret)
 /* spawnflags */ ATTRIB(MLRSTurret, spawnflags, int, TUR_FLAG_SPLASH | TUR_FLAG_MEDPROJ | TUR_FLAG_PLAYER);
 /* mins       */ ATTRIB(MLRSTurret, mins, vector, '-32 -32 0');
 /* maxs       */ ATTRIB(MLRSTurret, maxs, vector, '32 32 64');
 /* modelname  */ ATTRIB(MLRSTurret, mdl, string, "base.md3");
-/* model      */ ATTRIB(MLRSTurret, model, string, strzone(strcat("models/turrets/", this.mdl)));
-/* head_model */ ATTRIB(MLRSTurret, head_model, string, strzone(strcat("models/turrets/", "mlrs.md3")));
+/* model      */ ATTRIB_STRZONE(MLRSTurret, model, string, strcat("models/turrets/", this.mdl));
+/* head_model */ ATTRIB_STRZONE(MLRSTurret, head_model, string, strcat("models/turrets/", "mlrs.md3"));
 /* netname    */ ATTRIB(MLRSTurret, netname, string, "mlrs");
 /* fullname   */ ATTRIB(MLRSTurret, turret_name, string, _("MLRS Turret"));
     ATTRIB(MLRSTurret, m_weapon, Weapon, WEP_TUR_MLRS);
@@ -20,20 +20,18 @@ REGISTER_TURRET(MLRS, NEW(MLRSTurret));
 
 #ifdef IMPLEMENTATION
 
-#include "mlrs_weapon.qc"
-
 #ifdef SVQC
 
-spawnfunc(turret_mlrs) { if (!turret_initialize(TUR_MLRS)) remove(self); }
+spawnfunc(turret_mlrs) { if (!turret_initialize(this, TUR_MLRS)) remove(this); }
 
-METHOD(MLRSTurret, tr_think, void(MLRSTurret thistur))
+METHOD(MLRSTurret, tr_think, void(MLRSTurret thistur, entity it))
 {
     // 0 = full, 6 = empty
-    self.tur_head.frame = bound(0, 6 - floor(0.1 + self.ammo / self.shot_dmg), 6);
-    if(self.tur_head.frame < 0)
+    it.tur_head.frame = bound(0, 6 - floor(0.1 + it.ammo / it.shot_dmg), 6);
+    if(it.tur_head.frame < 0)
     {
-        LOG_TRACE("ammo:",ftos(self.ammo),"\n");
-        LOG_TRACE("shot_dmg:",ftos(self.shot_dmg),"\n");
+        LOG_TRACE("ammo:",ftos(it.ammo),"\n");
+        LOG_TRACE("shot_dmg:",ftos(it.shot_dmg),"\n");
     }
 }
 METHOD(MLRSTurret, tr_setup, void(MLRSTurret this, entity it))