]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Small fix for Electro ammo code
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 10 Feb 2011 17:48:18 +0000 (19:48 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 10 Feb 2011 17:48:18 +0000 (19:48 +0200)
qcsrc/server/w_electro.qc

index 160d2df7f0e6a9c59b116c66f62c792232b8d08f..92775d210013a8edf6468fe198f8166fef7975cb 100644 (file)
@@ -530,15 +530,16 @@ float w_electro(float req)
        {
                if(autocvar_g_balance_electro_lightning)
                {
-                       ammo_amount = !autocvar_g_balance_electro_primary_ammo || (self.ammo_cells > 0);
-                       if(autocvar_g_balance_electro_lightning)
-                               ammo_amount += self.weapon_load[WEP_ELECTRO] > 0;
+                       if(!autocvar_g_balance_electro_primary_ammo)
+                               ammo_amount = 1;
+                       else
+                               ammo_amount = self.ammo_cells > 0;
+                       ammo_amount += self.weapon_load[WEP_ELECTRO] > 0;
                }
                else
                {
                        ammo_amount = self.ammo_cells >= autocvar_g_balance_electro_primary_ammo;
-                       if(autocvar_g_balance_electro_lightning)
-                               ammo_amount += self.weapon_load[WEP_ELECTRO] >= autocvar_g_balance_electro_primary_ammo;
+                       ammo_amount += self.weapon_load[WEP_ELECTRO] >= autocvar_g_balance_electro_primary_ammo;
                }
                return ammo_amount;
        }