From a6fafb0894648e10f424a7f071f47996e2b28474 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 5 Mar 2017 04:31:03 +1000 Subject: [PATCH] Fix arc not switching weapons properly when out of ammo --- qcsrc/common/weapons/weapon/arc.qc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc index fb3eb0b76..7e77d3470 100644 --- a/qcsrc/common/weapons/weapon/arc.qc +++ b/qcsrc/common/weapons/weapon/arc.qc @@ -382,8 +382,9 @@ void W_Arc_Beam_Think(entity this) if(this == own.(weaponentity).arc_beam) { own.(weaponentity).arc_beam = NULL; } if(!thiswep.wr_checkammo1(thiswep, own, weaponentity) && !(own.items & IT_UNLIMITED_WEAPON_AMMO)) { - W_SwitchWeapon_Force(own, w_getbestweapon(own, weaponentity), weaponentity); - w_ready(thiswep, own, weaponentity, 1); + // note: this doesn't force the switch + W_SwitchToOtherWeapon(own, weaponentity); + own.(weaponentity).arc_BUTTON_ATCK_prev = false; // hax } delete(this); return; -- 2.39.2