]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix the ammo check for that last change
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 22 Jan 2011 15:18:04 +0000 (17:18 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 22 Jan 2011 15:18:04 +0000 (17:18 +0200)
qcsrc/server/w_minstanex.qc

index da25ad8ffab5deccbf68ac69b9af1bd1c7462cf5..207d1d71648cfd97fc2d75090bb6b34805f43964 100644 (file)
@@ -334,10 +334,12 @@ float w_minstanex(float req)
        }
        else if (req == WR_CHECKAMMO2)
        {
-               if(autocvar_g_balance_minstanex_laser_ammo)
-                       return autocvar_g_balance_minstanex_laser_ammo;
-               else
+               if(!autocvar_g_balance_minstanex_laser_ammo)
                        return TRUE;
+               if(autocvar_g_balance_minstanex_reload_ammo)
+                       return self.clip_load >= autocvar_g_balance_minstanex_laser_ammo;
+               else
+                       return self.ammo_cells >= autocvar_g_balance_minstanex_laser_ammo;
        }
        else if (req == WR_RESETPLAYER)
        {