Merge branch 'master' into Mario/wepent_experimental

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

diff --git a/qcsrc/common/turrets/turret/machinegun.qc b/qcsrc/common/turrets/turret/machinegun.qc
index 9911b97c6e21d86311b3e4d416607ec0c0a41630..db3cb47bf2fbb6cc3d173ccce2edba39f3ea6072 100644 (file)
--- a/qcsrc/common/turrets/turret/machinegun.qc
+++ b/qcsrc/common/turrets/turret/machinegun.qc
@@ -1,30 +1,10 @@
-#ifndef TURRET_MACHINEGUN_H
-#define TURRET_MACHINEGUN_H
-
-#include "machinegun_weapon.qc"
-
-CLASS(MachineGunTurret, Turret)
-/* spawnflags */ ATTRIB(MachineGunTurret, spawnflags, int, TUR_FLAG_PLAYER);
-/* mins       */ ATTRIB(MachineGunTurret, mins, vector, '-32 -32 0');
-/* maxs       */ ATTRIB(MachineGunTurret, maxs, vector, '32 32 64');
-/* modelname  */ ATTRIB(MachineGunTurret, mdl, string, "base.md3");
-/* model      */ ATTRIB(MachineGunTurret, model, string, strzone(strcat("models/turrets/", this.mdl)));
-/* head_model */ ATTRIB(MachineGunTurret, head_model, string, strzone(strcat("models/turrets/", "machinegun.md3")));
-/* netname    */ ATTRIB(MachineGunTurret, netname, string, "machinegun");
-/* fullname   */ ATTRIB(MachineGunTurret, turret_name, string, _("Machinegun Turret"));
-    ATTRIB(MachineGunTurret, m_weapon, Weapon, WEP_TUR_MACHINEGUN);
-ENDCLASS(MachineGunTurret)
-REGISTER_TURRET(MACHINEGUN, NEW(MachineGunTurret));
-
-#endif
+#include "machinegun.qh"
 
 #ifdef IMPLEMENTATION
 
-#include "machinegun_weapon.qc"
-
 #ifdef SVQC
 
-spawnfunc(turret_machinegun) { if (!turret_initialize(TUR_MACHINEGUN)) remove(self); }
+spawnfunc(turret_machinegun) { if (!turret_initialize(this, TUR_MACHINEGUN)) delete(this); }
 
 METHOD(MachineGunTurret, tr_setup, void(MachineGunTurret this, entity it))
 {