diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-07-30 14:11:06 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-07-30 14:32:34 +0200 |
| commit | eafa9cc10797db529e74b0480f51d7b8ade12cfe (patch) | |
| tree | f71aaea5e1ffad4cb1584f6858e633d07373a651 /src/control/Pickups.h | |
| parent | Fix Win32 OAL build (diff) | |
| download | re3-eafa9cc10797db529e74b0480f51d7b8ade12cfe.tar re3-eafa9cc10797db529e74b0480f51d7b8ade12cfe.tar.gz re3-eafa9cc10797db529e74b0480f51d7b8ade12cfe.tar.bz2 re3-eafa9cc10797db529e74b0480f51d7b8ade12cfe.tar.lz re3-eafa9cc10797db529e74b0480f51d7b8ade12cfe.tar.xz re3-eafa9cc10797db529e74b0480f51d7b8ade12cfe.tar.zst re3-eafa9cc10797db529e74b0480f51d7b8ade12cfe.zip | |
Diffstat (limited to 'src/control/Pickups.h')
| -rw-r--r-- | src/control/Pickups.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/control/Pickups.h b/src/control/Pickups.h index 423f864b..8f6ef4c3 100644 --- a/src/control/Pickups.h +++ b/src/control/Pickups.h @@ -33,14 +33,19 @@ class CPlayerPed; class CPickup { public: - ePickupType m_eType; - bool m_bRemoved; - uint16 m_nQuantity; + CVector m_vecPos; + uint32 m_nRevenue; CObject *m_pObject; + CObject *m_pExtraObject; + uint16 m_nQuantity; uint32 m_nTimer; + int16 m_nMoneySpeed; int16 m_eModelIndex; uint16 m_nIndex; - CVector m_vecPos; + char m_sTextKey[8]; + ePickupType m_eType; + bool m_bRemoved; + uint8 m_effects; CObject *GiveUsAPickUpObject(int32 handle); bool Update(CPlayerPed *player, CVehicle *vehicle, int playerId); @@ -71,6 +76,7 @@ class CPickups static tPickupMessage aMessages[NUMPICKUPMESSAGES]; public: static int32 PlayerOnWeaponPickup; + static int32 CollectPickupBuffer; static void Init(); static void Update(); @@ -79,7 +85,7 @@ public: static void DoMoneyEffects(CEntity *ent); static void DoMineEffects(CEntity *ent); static void DoPickUpEffects(CEntity *ent); - static int32 GenerateNewOne(CVector pos, uint32 modelIndex, uint8 type, uint32 quantity, uint32 rate = 0, bool highPriority = false, wchar* pText = nil); + static int32 GenerateNewOne(CVector pos, uint32 modelIndex, uint8 type, uint32 quantity, uint32 rate = 0, bool highPriority = false, char* pText = nil); static int32 GenerateNewOne_WeaponType(CVector pos, eWeaponType weaponType, uint8 type, uint32 quantity); static void RemovePickUp(int32 pickupIndex); static void RemoveAllFloatingPickups(); |