]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
fix "infinite" burst happening when reload ammo was 0 (as in XDF) 718/head
authorMartin Taibr <taibr.martin@gmail.com>
Wed, 18 Sep 2019 09:54:20 +0000 (11:54 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Wed, 18 Sep 2019 09:54:20 +0000 (11:54 +0200)
qcsrc/common/weapons/weapon/machinegun.qc

index 5a55b7e8b51257d1a1e3fec9c941f3fd33c2172f..e16ffe66bd451b1a7a4927aaa047417cd3d645db 100644 (file)
@@ -217,14 +217,24 @@ METHOD(MachineGun, wr_think, void(entity thiswep, entity actor, .entity weaponen
                 w_ready(thiswep, actor, weaponentity, fire);
                 return;
             }
+
+            float ammo_available;
+            if (WEP_CVAR(machinegun, reload_ammo) > 0)
+            {
+                ammo_available = actor.(weaponentity).clip_load;
+            }
+            else
+            {
+                ammo_available = GetResource(actor, thiswep.ammo_type);
+            }
+
             // We don't want to shoot 3 rounds if there's 2 left in the mag, so we'll use a fraction.
             // Also keep the fraction <= 1 otherwise we'd mag dump in one burst.
-            float burst_fraction = min(1, actor.(weaponentity).clip_load / WEP_CVAR(machinegun, burst_ammo));
+            float burst_fraction = min(1, ammo_available / WEP_CVAR(machinegun, burst_ammo));
             int to_shoot = floor(WEP_CVAR(machinegun, burst) * burst_fraction);
 
             // We also don't want to use 3 rounds if there's only 2 left.
-            int to_use = min(WEP_CVAR(machinegun, burst_ammo), actor.(weaponentity).clip_load);
+            int to_use = min(WEP_CVAR(machinegun, burst_ammo), ammo_available);
             W_DecreaseAmmo(thiswep, actor, to_use, weaponentity);
 
             // Bursting counts up to 0 from a negative.