diff --git a/similar/main/weapon.cpp b/similar/main/weapon.cpp index 18aace0bc..e7464ad04 100644 --- a/similar/main/weapon.cpp +++ b/similar/main/weapon.cpp @@ -229,8 +229,9 @@ has_weapon_result player_has_primary_weapon(int weapon_num) has_weapon_result player_has_secondary_weapon(int weapon_num) { int return_value = 0; + const auto secondary_ammo = get_local_player_secondary_ammo()[weapon_num]; const auto weapon_index = Secondary_weapon_to_weapon_info[weapon_num]; - if (Weapon_info[weapon_index].ammo_usage <= get_local_player_secondary_ammo()[weapon_num]) + if (secondary_ammo && Weapon_info[weapon_index].ammo_usage <= secondary_ammo) return_value = has_weapon_result::has_weapon_flag | has_weapon_result::has_energy_flag | has_weapon_result::has_ammo_flag; return return_value; }