From: Mario Date: Thu, 30 Jun 2016 22:27:52 +0000 (+1000) Subject: Fix HMG firing after its time is up X-Git-Tag: xonotic-v0.8.2~700^2~109 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b2d62cb9e477af7446a2a113a59c0eb9174e5444;p=xonotic%2Fxonotic-data.pk3dir.git Fix HMG firing after its time is up --- diff --git a/qcsrc/common/mutators/mutator/overkill/hmg.qc b/qcsrc/common/mutators/mutator/overkill/hmg.qc index e0ae53931..b8fd74309 100644 --- a/qcsrc/common/mutators/mutator/overkill/hmg.qc +++ b/qcsrc/common/mutators/mutator/overkill/hmg.qc @@ -62,8 +62,7 @@ void W_HeavyMachineGun_Attack_Auto(Weapon thiswep, entity actor, .entity weapone return; } - if(!thiswep.wr_checkammo1(thiswep, actor)) - if(!(actor.items & IT_UNLIMITED_WEAPON_AMMO)) + if((!thiswep.wr_checkammo1(thiswep, actor) && !(actor.items & IT_UNLIMITED_WEAPON_AMMO)) || (!(actor.items & IT_SUPERWEAPON) && !(actor.items & IT_UNLIMITED_SUPERWEAPONS))) { W_SwitchWeapon_Force(actor, w_getbestweapon(actor)); w_ready(thiswep, actor, weaponentity, fire);