Merge branch 'master' into DefaultUser/func_button_relay

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / overkill / oknex.qh

diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qh b/qcsrc/common/mutators/mutator/overkill/oknex.qh
index 599a7af044d5c7bb09a0fb26e5eda40af87ac8a1..f38588e39e6a9a2ef11804b6edea7711e821d30e 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/oknex.qh
+++ b/qcsrc/common/mutators/mutator/overkill/oknex.qh
@@ -4,7 +4,7 @@ CLASS(OverkillNex, Weapon)
 /* spawnfunc */ ATTRIB(OverkillNex, m_canonical_spawnfunc, string, "weapon_oknex");
 /* ammotype  */ ATTRIB(OverkillNex, ammo_type, int, RESOURCE_CELLS);
 /* impulse   */ ATTRIB(OverkillNex, impulse, int, 7);
-/* flags     */ ATTRIB(OverkillNex, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN);
+/* flags     */ ATTRIB(OverkillNex, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED);
 /* rating    */ ATTRIB(OverkillNex, bot_pickupbasevalue, float, 8000);
 /* color     */ ATTRIB(OverkillNex, wpcolor, vector, '0.5 1 1');
 /* modelname */ ATTRIB(OverkillNex, mdl, string, "ok_sniper");
@@ -14,7 +14,7 @@ CLASS(OverkillNex, Weapon)
 /* crosshair */ ATTRIB(OverkillNex, w_crosshair, string, "gfx/crosshairnex");
 /* crosshair */ ATTRIB(OverkillNex, w_crosshair_size, float, 0.65);
 /* reticle   */ ATTRIB(OverkillNex, w_reticle, string, "gfx/reticle_nex");
-/* wepimg    */ ATTRIB(OverkillNex, model2, string, "weaponnex");
+/* wepimg    */ ATTRIB(OverkillNex, model2, string, "ok_weapon_rail");
 /* refname   */ ATTRIB(OverkillNex, netname, string, "oknex");
 /* wepname   */ ATTRIB(OverkillNex, m_name, string, _("Overkill Nex"));
 
@@ -74,4 +74,4 @@ ENDCLASS(OverkillNex)
 REGISTER_WEAPON(OVERKILL_NEX, oknex, NEW(OverkillNex));
 
 
-SPAWNFUNC_WEAPON(weapon_oknex, WEP_OVERKILL_NEX)
+//SPAWNFUNC_WEAPON(weapon_oknex, WEP_OVERKILL_NEX)