From daaf48c4af64572bb3d97104ecb99eca92ec5d26 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Sat, 22 Jan 2011 19:03:21 +0200 Subject: [PATCH] Properly check the weapon we are switching to --- qcsrc/server/cl_weaponsystem.qc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc index fd1da3162..5b444e7d1 100644 --- a/qcsrc/server/cl_weaponsystem.qc +++ b/qcsrc/server/cl_weaponsystem.qc @@ -931,7 +931,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain) // allow switching to reloadable weapons, even if we're out of ammo, since the weapon itself // might still be loaded. The reload code takes care of complaining and forced switching entity e; - e = get_weaponinfo(self.switchweapon); + e = get_weaponinfo(wpn); if(cvar(strcat("g_balance_", e.netname, "_reload_ammo"))) f = 1; -- 2.39.2