skip non-reloadable weapons, or we access undefined cvars. Also a balance tweak

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index e60aa20f168e62dfecc565adb280f0c7567b954d..03712f87075052f4904d9d474fcbc5e07069b67d 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -243,7 +243,7 @@ set g_balance_laser_secondary_gauntlet 1
 set g_balance_laser_secondary_force_zscale 1.25
 set g_balance_laser_secondary_force_velocitybias 0
 set g_balance_laser_secondary_force_other_scale 0
-set g_balance_laser_reload_ammo 5
+set g_balance_laser_reload_ammo 6
 set g_balance_laser_reload_time 2
 // }}}
 // {{{ shotgun

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index 5b444e7d19ec43f8febd65934bad9c5c6282285a..2c160848dc7248bca9bc105dac44cb8605a38a29 100644 (file)
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -932,6 +932,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
                                // might still be loaded. The reload code takes care of complaining and forced switching
                                entity e;
                                e = get_weaponinfo(wpn);
+                               if(wpn != WEP_TUBA && wpn != WEP_PORTO && wpn != WEP_HOOK) // skip non-reloadable weapons, or we access undefined cvars
                                if(cvar(strcat("g_balance_", e.netname, "_reload_ammo")))
                                        f = 1;
 
@@ -1058,6 +1059,7 @@ float weapon_prepareattack_checkammo(float secondary)
                // might still be loaded. The reload code takes care of complaining and forced switching
                entity e;
                e = get_weaponinfo(self.weapon);
+               if(self.weapon != WEP_TUBA && self.weapon != WEP_PORTO && self.weapon != WEP_HOOK) // skip non-reloadable weapons, or we access undefined cvars
                if(cvar(strcat("g_balance_", e.netname, "_reload_ammo")))
                        return FALSE;