summaryrefslogtreecommitdiffstats
path: root/src/peds/Ped.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-11-25 18:39:57 +0100
committerSergeanur <s.anureev@yandex.ua>2020-11-25 18:39:57 +0100
commit164f16c85b73176a6f2baf1e70e8ee8c575eb835 (patch)
tree586abc75cbc07f0cafe22e0b5d63fd18d2fd61e3 /src/peds/Ped.cpp
parentOriginal enum name (diff)
downloadre3-164f16c85b73176a6f2baf1e70e8ee8c575eb835.tar
re3-164f16c85b73176a6f2baf1e70e8ee8c575eb835.tar.gz
re3-164f16c85b73176a6f2baf1e70e8ee8c575eb835.tar.bz2
re3-164f16c85b73176a6f2baf1e70e8ee8c575eb835.tar.lz
re3-164f16c85b73176a6f2baf1e70e8ee8c575eb835.tar.xz
re3-164f16c85b73176a6f2baf1e70e8ee8c575eb835.tar.zst
re3-164f16c85b73176a6f2baf1e70e8ee8c575eb835.zip
Diffstat (limited to 'src/peds/Ped.cpp')
-rw-r--r--src/peds/Ped.cpp4
1 files changed, 1 insertions, 3 deletions
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);