From b689df7dd8a98a11554404cdde4db8035998799a Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Fri, 21 Jan 2011 04:05:29 +0200 Subject: [PATCH] Small forgotten fix --- balanceXonotic.cfg | 2 +- qcsrc/server/w_shotgun.qc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index 24bdbe08b..414222b28 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -263,7 +263,7 @@ set g_balance_shotgun_secondary_damage 110 set g_balance_shotgun_secondary_force 150 set g_balance_shotgun_secondary_refire 1.1 set g_balance_shotgun_secondary_animtime 1 -set g_balance_shotgun_reload_ammo 5 +set g_balance_shotgun_reload_ammo 4 // }}} // {{{ uzi set g_balance_uzi_mode 1 // Activates varible spread for sustained & burst mode secondary diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc index 13f2cfe67..af9a78f8d 100644 --- a/qcsrc/server/w_shotgun.qc +++ b/qcsrc/server/w_shotgun.qc @@ -20,7 +20,7 @@ void W_Shotgun_ReloadedAndReady() // now do the ammo maths self.ammo_counter = 0; // when we get here it's -1 - while(self.ammo_counter < autocvar_g_balance_shotgun_reload_ammo) + while(self.ammo_counter < autocvar_g_balance_shotgun_reload_ammo && self.ammo_shells) // make sure we don't add more than the amount of ammo we have { self.ammo_counter += 1; self.ammo_shells -= 1; -- 2.39.2