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 faaf89ffc0348ed7816ec11ca6a996c4ad07cfaa..20eeb7759589b5d415a386b141954ce9e1456e5b 100644 (file)
--- a/qcsrc/common/turrets/turret/flac.qc
+++ b/qcsrc/common/turrets/turret/flac.qc
@@ -1,7 +1,7 @@
 #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);
@@ -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))
 {