X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Foverkill%2Fokshotgun.qh;h=b0feadda0499da1d8189bef760872bdc61417c90;hb=821767330613f134fe04791532f44e63741ee6c6;hp=80b85039a54b80293bdcc8ef8a5a30c12a1ac0f1;hpb=0d3433983a92ad80893fd18781e01a99857e94c1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh
index 80b85039a..b0feadda0 100644
--- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh
+++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh
@@ -1,18 +1,19 @@
 #pragma once
 
 CLASS(OverkillShotgun, Weapon)
-/* ammotype  */ ATTRIB(OverkillShotgun, ammo_field, .int, ammo_shells);
+/* spawnfunc */ ATTRIB(OverkillShotgun, m_canonical_spawnfunc, string, "weapon_okshotgun");
+/* ammotype  */ ATTRIB(OverkillShotgun, ammo_type, int, RESOURCE_SHELLS);
 /* impulse   */ ATTRIB(OverkillShotgun, impulse, int, 2);
 /* flags     */ ATTRIB(OverkillShotgun, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN);
 /* rating    */ ATTRIB(OverkillShotgun, bot_pickupbasevalue, float, 6000);
 /* color     */ ATTRIB(OverkillShotgun, wpcolor, vector, '0.5 0.25 0');
 /* modelname */ ATTRIB(OverkillShotgun, mdl, string, "ok_shotgun");
 #ifdef GAMEQC
-/* model     */ ATTRIB(OverkillShotgun, m_model, Model, MDL_SHOTGUN_ITEM);
+/* model     */ ATTRIB(OverkillShotgun, m_model, Model, MDL_OK_SHOTGUN_ITEM);
 #endif
 /* crosshair */ ATTRIB(OverkillShotgun, w_crosshair, string, "gfx/crosshairshotgun");
 /* crosshair */ ATTRIB(OverkillShotgun, w_crosshair_size, float, 0.65);
-/* wepimg    */ ATTRIB(OverkillShotgun, model2, string, "weaponshotgun");
+/* wepimg    */ ATTRIB(OverkillShotgun, model2, string, "weaponokshotgun");
 /* refname   */ ATTRIB(OverkillShotgun, netname, string, "okshotgun");
 /* wepname   */ ATTRIB(OverkillShotgun, m_name, string, _("Overkill Shotgun"));
 
@@ -27,7 +28,6 @@ CLASS(OverkillShotgun, Weapon)
 		P(class, prefix, refire, float, PRI) \
 		P(class, prefix, solidpenetration, float, PRI) \
 		P(class, prefix, spread, float, PRI) \
-		P(class, prefix, ammo, float, SEC) \
 		P(class, prefix, animtime, float, SEC) \
 		P(class, prefix, damage, float, SEC) \
 		P(class, prefix, delay, float, SEC) \
@@ -54,3 +54,5 @@ CLASS(OverkillShotgun, Weapon)
 
 ENDCLASS(OverkillShotgun)
 REGISTER_WEAPON(OVERKILL_SHOTGUN, okshotgun, NEW(OverkillShotgun));
+
+SPAWNFUNC_WEAPON(weapon_okshotgun, WEP_OVERKILL_SHOTGUN)