Fix possible segfault caused by #2468 when guns are fired (#2516)

* Update ranged.cpp Fix dumb code I made * Update src/ranged.cpp Co-authored-by: scarf <[email protected]> --------- Co-authored-by: scarf <[email protected]>
cataclysmbnteam · Mar 31, 2023 · 9fc83b6 · 9fc83b6
1 parent 662c8b4
commit 9fc83b6
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/ranged.cpp b/src/ranged.cpp
@@ -841,10 +841,9 @@ int ranged::fire_gun( Character &who, const tripoint &target, int max_shots, ite
 
     int shots = max_shots;
     // Number of shots to fire is limited by the amount of remaining ammo
-    if( gun.ammo_required() && !ammo ) {
-        shots = std::min( shots, static_cast<int>( gun.ammo_remaining() / gun.ammo_required() ) );
-    } else {
-        shots = std::min( shots, ammo.get_item()->count() / gun.ammo_required() );
+    if( gun.ammo_required() ) {
+        const int ammo_left = ammo ? ammo.get_item()->count() : gun.ammo_remaining();
+        shots = std::min( shots, ammo_left / gun.ammo_required() );
     }
 
     // cap our maximum burst size by the amount of UPS power left