Merge branch 'master' into Mirio/balance

[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 20eeb7759589b5d415a386b141954ce9e1456e5b..ab6e5f5cb67afe9bec1f43fb0adf6a88df0a309f 100644 (file)
--- a/qcsrc/common/turrets/turret/flac.qc
+++ b/qcsrc/common/turrets/turret/flac.qc
@@ -1,22 +1,4 @@
-#ifndef TURRET_FLAC_H
-#define TURRET_FLAC_H
-
-#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_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);
-ENDCLASS(Flac)
-REGISTER_TURRET(FLAC, NEW(Flac));
-
-#endif
+#include "flac.qh"
 
 #ifdef IMPLEMENTATION