]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix electro beam ammo check. Not fully ready
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 25 Jan 2011 16:07:31 +0000 (18:07 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 25 Jan 2011 16:07:31 +0000 (18:07 +0200)
qcsrc/server/w_electro.qc

index 2952391503a2a4dbf48e02951207861e0cce9d8e..61115b3a9084a50a9e6591b3ceb96bf606ae825c 100644 (file)
@@ -554,16 +554,18 @@ float w_electro(float req)
        else if (req == WR_CHECKAMMO1)
        {
                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.electro_load > 0;
+               }
                else
-                       ammo_amount = self.ammo_cells >= autocvar_g_balance_electro_primary_ammo;
-               if(autocvar_g_balance_electro_reload_ammo)
                {
+                       ammo_amount = self.ammo_cells >= autocvar_g_balance_electro_primary_ammo;
                        if(autocvar_g_balance_electro_lightning)
-                               ammo_amount += !autocvar_g_balance_electro_primary_ammo || (self.electro_load > 0);
-                       else
                                ammo_amount += self.electro_load >= autocvar_g_balance_electro_primary_ammo;
                }
+
                return ammo_amount;
        }
        else if (req == WR_CHECKAMMO2)