From 0e74b8f536375d897f2e73dcf2e3f616192cfe06 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Tue, 17 Sep 2019 02:59:27 +0200 Subject: [PATCH] Wipe a_ammoX variables when switching to a new weapon, to make sure they don't get carried over from another one. --- src/shared/valve/weapon_common.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/shared/valve/weapon_common.c b/src/shared/valve/weapon_common.c index 7ecd5b8f..8d920cf3 100644 --- a/src/shared/valve/weapon_common.c +++ b/src/shared/valve/weapon_common.c @@ -43,6 +43,9 @@ void Weapons_Draw(void) pl.w_idle_next = 2.5f; pl.viewzoom = 1.0f; + /* make sure this is all wiped */ + pl.a_ammo1 = pl.a_ammo2 = pl.a_ammo3 = 0; + if (g_weapons[i].draw != __NULL__) { g_weapons[i].draw(); }