Merge branch 'master' into Mario/wepent_experimental

[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 43710b6c02f91e6b82ee5eb220b8a41874484d6a..472a0cb09a5c410ad5ae5a7060e410799189ccd4 100644 (file)
--- a/qcsrc/common/turrets/turret/mlrs.qc
+++ b/qcsrc/common/turrets/turret/mlrs.qc
@@ -1,38 +1,19 @@
-#ifndef TURRET_MLRS_H
-#define TURRET_MLRS_H
-
-#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_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);
-ENDCLASS(MLRSTurret)
-REGISTER_TURRET(MLRS, NEW(MLRSTurret));
-
-#endif
+#include "mlrs.qh"
 
 #ifdef IMPLEMENTATION
 
 #ifdef SVQC
 
-spawnfunc(turret_mlrs) { if (!turret_initialize(TUR_MLRS)) remove(self); }
+spawnfunc(turret_mlrs) { if (!turret_initialize(this, TUR_MLRS)) delete(this); }
 
 METHOD(MLRSTurret, tr_think, void(MLRSTurret thistur, entity it))
 {
-    SELFPARAM();
     // 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));
+        LOG_TRACE("shot_dmg:",ftos(it.shot_dmg));
     }
 }
 METHOD(MLRSTurret, tr_setup, void(MLRSTurret this, entity it))