From 164f16c85b73176a6f2baf1e70e8ee8c575eb835 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Wed, 25 Nov 2020 19:39:57 +0200 Subject: Some TODOs done in Peds code --- src/peds/Ped.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/peds/Ped.cpp') diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 0c8e0416..acf219b4 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -4712,9 +4712,7 @@ CPed::GiveWeapon(eWeaponType weaponType, uint32 ammo, bool unused) GetWeapon(slot).m_eWeaponState = WEAPONSTATE_READY; } else { if (HasWeaponSlot(slot)) { - - // TODO(Miami): Make an enum for that - if (slot == 4 || slot == 5 || slot == 6) + if (CWeaponInfo::IsWeaponSlotAmmoMergeable(slot)) ammo += GetWeapon(slot).m_nAmmoTotal; RemoveWeaponModel(CWeaponInfo::GetWeaponInfo(GetWeapon(slot).m_eWeaponType)->m_nModelId); -- cgit v1.2.3