Small forgotten fix

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 24bdbe08bd8a0724f4bfdb44a80ca1fa3e4d6483..414222b286d664a6687262010c9be19b40fda71d 100644 (file)
--- 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 13f2cfe67e4292621205b64c210f9e510e3032ae..af9a78f8db3f762a494e3b5df9178fbfca0422e4 100644 (file)
--- 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;