summaryrefslogtreecommitdiffstats
path: root/src/peds/Ped.h
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-16 01:10:23 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-16 01:10:23 +0200
commitf864698696fc5451372dffbc37255d4be0fa08ee (patch)
tree12061ef6435799ee16b7804a5fa2a15f91032a38 /src/peds/Ped.h
parentsync with upstream (diff)
downloadre3-f864698696fc5451372dffbc37255d4be0fa08ee.tar
re3-f864698696fc5451372dffbc37255d4be0fa08ee.tar.gz
re3-f864698696fc5451372dffbc37255d4be0fa08ee.tar.bz2
re3-f864698696fc5451372dffbc37255d4be0fa08ee.tar.lz
re3-f864698696fc5451372dffbc37255d4be0fa08ee.tar.xz
re3-f864698696fc5451372dffbc37255d4be0fa08ee.tar.zst
re3-f864698696fc5451372dffbc37255d4be0fa08ee.zip
Diffstat (limited to '')
-rw-r--r--src/peds/Ped.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index 4efad358..f86f23d3 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -865,8 +865,8 @@ public:
void SetNewAttraction(CPedAttractor* pAttractor, const CVector& pos, float, float, int);
void ClearWaitState(void);
- bool HasWeapon(uint8 weaponType) { return m_weapons[weaponType].m_eWeaponType == weaponType; }
- CWeapon &GetWeapon(uint8 weaponType) { return m_weapons[weaponType]; }
+ bool HasWeaponSlot(uint8 slot) { return m_weapons[slot].m_eWeaponType != WEAPONTYPE_UNARMED; }
+ CWeapon& GetWeapon(uint8 slot) { return m_weapons[slot]; }
CWeapon *GetWeapon(void) { return &m_weapons[m_currentWeapon]; }
PedState GetPedState(void) { return m_nPedState; }