Merge branch 'master' into martin-t/ok-config and remove workaround from ruleset cfg

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / turret / flac_weapon.qh

diff --git a/qcsrc/common/turrets/turret/flac_weapon.qh b/qcsrc/common/turrets/turret/flac_weapon.qh
index 13965bf513a911239d173ac78b1537225145aef5..d27061473a5a29064aa9517df3cf70586a18d30b 100644 (file)
--- a/qcsrc/common/turrets/turret/flac_weapon.qh
+++ b/qcsrc/common/turrets/turret/flac_weapon.qh
@@ -1,9 +1,7 @@
 #pragma once
 
 #pragma once
 

-// TODO: WEP_TYPE_OTHER?
-

 CLASS(FlacAttack, PortoLaunch)
 CLASS(FlacAttack, PortoLaunch)

-/* flags     */ ATTRIB(FlacAttack, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_HIDDEN | WEP_FLAG_MUTATORBLOCKED);
+/* flags     */ ATTRIB(FlacAttack, spawnflags, int, WEP_FLAG_SPECIALATTACK | WEP_FLAG_HIDDEN);

 /* impulse   */ ATTRIB(FlacAttack, impulse, int, 5);
 /* refname   */ ATTRIB(FlacAttack, netname, string, "turret_flac");
 /* wepname   */ ATTRIB(FlacAttack, m_name, string, _("FLAC"));
 /* impulse   */ ATTRIB(FlacAttack, impulse, int, 5);
 /* refname   */ ATTRIB(FlacAttack, netname, string, "turret_flac");
 /* wepname   */ ATTRIB(FlacAttack, m_name, string, _("FLAC"));