diff options
| author | aap <aap@papnet.eu> | 2019-07-02 07:43:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-02 07:43:00 +0200 |
| commit | b2d1433392483c3e1faafcf5127885cb425527e0 (patch) | |
| tree | 477b9853bea245d9cbdaa8700e02ff980abe79d5 /src/entities/Ped.h | |
| parent | Merge pull request #85 from erorcun/erorcun (diff) | |
| parent | Kangaroo cheat and bug fixes (diff) | |
| download | re3-b2d1433392483c3e1faafcf5127885cb425527e0.tar re3-b2d1433392483c3e1faafcf5127885cb425527e0.tar.gz re3-b2d1433392483c3e1faafcf5127885cb425527e0.tar.bz2 re3-b2d1433392483c3e1faafcf5127885cb425527e0.tar.lz re3-b2d1433392483c3e1faafcf5127885cb425527e0.tar.xz re3-b2d1433392483c3e1faafcf5127885cb425527e0.tar.zst re3-b2d1433392483c3e1faafcf5127885cb425527e0.zip | |
Diffstat (limited to 'src/entities/Ped.h')
| -rw-r--r-- | src/entities/Ped.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/entities/Ped.h b/src/entities/Ped.h index 572ed17d..92fa32c1 100644 --- a/src/entities/Ped.h +++ b/src/entities/Ped.h @@ -382,7 +382,7 @@ public: bool IsPointerValid(void); void SortPeds(CPed**, int, int); void BuildPedLists(void); - void GiveWeapon(eWeaponType weaponType, uint32 ammo); + uint32 GiveWeapon(eWeaponType weaponType, uint32 ammo); void SetPedStats(ePedStats); static void GetLocalPositionToOpenCarDoor(CVector *output, CVehicle *veh, uint32 enterType, float offset); static void GetPositionToOpenCarDoor(CVector *output, CVehicle *veh, uint32 enterType, float seatPosMult); @@ -416,8 +416,8 @@ public: static void PedSetQuickDraggedOutCarPositionCB(CAnimBlendAssociation *assoc, void *arg); static void PedSetDraggedOutCarPositionCB(CAnimBlendAssociation *assoc, void *arg); - inline bool HasWeapon(uint32 weaponType) { return m_weapons[weaponType].m_eWeaponType == weaponType; } - inline CWeapon *GetWeapon(uint32 weaponType) { return &m_weapons[weaponType]; } + inline bool HasWeapon(uint8 weaponType) { return m_weapons[weaponType].m_eWeaponType == weaponType; } + inline CWeapon &GetWeapon(uint8 weaponType) { return m_weapons[weaponType]; } inline CWeapon *GetWeapon(void) { return &m_weapons[m_currentWeapon]; } inline RwFrame *GetNodeFrame(int nodeId) { return m_pFrames[nodeId]->frame; } |