X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Fshotgun.qc;h=27dfe4e4f6e096b0e191198c2cddb104eefb496a;hb=eb6fabc8b16e23fcf0704ecf97685dffa7387bb7;hp=c50eff100e81f04bb69551bc54d1eae0c6bc3af6;hpb=bd2645ddf4d7e7ca133ae7a87c3b85521e5a7e7b;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/weapons/weapon/shotgun.qc b/qcsrc/common/weapons/weapon/shotgun.qc index c50eff100..27dfe4e4f 100644 --- a/qcsrc/common/weapons/weapon/shotgun.qc +++ b/qcsrc/common/weapons/weapon/shotgun.qc @@ -200,7 +200,7 @@ void W_Shotgun_Attack3_Frame2(Weapon thiswep, entity actor, .entity weaponentity if (!thiswep.wr_checkammo2(thiswep)) if (!(actor.items & IT_UNLIMITED_WEAPON_AMMO)) { - W_SwitchWeapon_Force(actor, w_getbestweapon(actor)); + W_SwitchWeapon_Force(actor, Weapons_from(w_getbestweapon(actor))); w_ready(thiswep, actor, weaponentity, fire); return; } @@ -214,7 +214,7 @@ void W_Shotgun_Attack3_Frame1(Weapon thiswep, entity actor, .entity weaponentity if (!thiswep.wr_checkammo2(thiswep)) if (!(actor.items & IT_UNLIMITED_WEAPON_AMMO)) { - W_SwitchWeapon_Force(actor, w_getbestweapon(actor)); + W_SwitchWeapon_Force(actor, Weapons_from(w_getbestweapon(actor))); w_ready(thiswep, actor, weaponentity, fire); return; }