Merge branch 'Mario/showspecs' into 'master'

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

diff --git a/qcsrc/common/turrets/turret/flac.qc b/qcsrc/common/turrets/turret/flac.qc
index 1c9122f6733670c3841336c03a0693e760ace6d5..20eeb7759589b5d415a386b141954ce9e1456e5b 100644 (file)
--- a/qcsrc/common/turrets/turret/flac.qc
+++ b/qcsrc/common/turrets/turret/flac.qc
@@ -1,15 +1,15 @@
 #ifndef TURRET_FLAC_H
 #define TURRET_FLAC_H
 
-#include "flac_weapon.qc"
+#include "flac_weapon.qh"
 
 CLASS(Flac, Turret)
 /* spawnflags */ ATTRIB(Flac, spawnflags, int, TUR_FLAG_SPLASH | TUR_FLAG_FASTPROJ | TUR_FLAG_MISSILE);
 /* mins       */ ATTRIB(Flac, mins, vector, '-32 -32 0');
 /* maxs       */ ATTRIB(Flac, maxs, vector, '32 32 64');
 /* modelname  */ ATTRIB(Flac, mdl, string, "base.md3");
-/* model      */ ATTRIB(Flac, model, string, strzone(strcat("models/turrets/", this.mdl)));
-/* head_model */ ATTRIB(Flac, head_model, string, strzone(strcat("models/turrets/", "flac.md3")));
+/* model      */ ATTRIB_STRZONE(Flac, model, string, strcat("models/turrets/", this.mdl));
+/* head_model */ ATTRIB_STRZONE(Flac, head_model, string, strcat("models/turrets/", "flac.md3"));
 /* netname    */ ATTRIB(Flac, netname, string, "flac");
 /* fullname   */ ATTRIB(Flac, turret_name, string, _("FLAC Cannon"));
     ATTRIB(Flac, m_weapon, Weapon, WEP_FLAC);
@@ -20,11 +20,9 @@ REGISTER_TURRET(FLAC, NEW(Flac));
 
 #ifdef IMPLEMENTATION
 
-#include "flac_weapon.qc"
-
 #ifdef SVQC
 
-spawnfunc(turret_flac) { if (!turret_initialize(TUR_FLAC)) remove(self); }
+spawnfunc(turret_flac) { if (!turret_initialize(this, TUR_FLAC)) delete(this); }
 
 METHOD(Flac, tr_setup, void(Flac this, entity it))
 {