From 1512b2525d4964c7611c38302566fb35b663e5de Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Fri, 21 Jan 2011 19:21:51 +0200 Subject: [PATCH] Don't switch to another weapon when reloading, if there's no more ammo but there's still some load inside the gun --- qcsrc/server/cl_weaponsystem.qc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc index 94074f100..c1c87d63e 100644 --- a/qcsrc/server/cl_weaponsystem.qc +++ b/qcsrc/server/cl_weaponsystem.qc @@ -1646,8 +1646,11 @@ float W_ReloadCheck(float ammo_amount) sprint(self, strcat("You don't have any ammo to reload the ^2", W_Name(self.weapon), "\n")); self.reload_complain = time + 1; } - self.ammo_counter = -1; // reload later - W_SwitchToOtherWeapon(self); + if(!self.ammo_counter) + { + self.ammo_counter = -1; // reload later + W_SwitchToOtherWeapon(self); + } return 0; } -- 2.39.2