summaryrefslogtreecommitdiffstats
path: root/src/control/Pickups.h
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-10-17 07:23:01 +0200
committerSergeanur <s.anureev@yandex.ua>2020-10-17 07:23:01 +0200
commitef47dad566db734b1efda862c414cf89af53d07e (patch)
tree6e00e4f9cff641a19b8d4cd5edfb4276651e927f /src/control/Pickups.h
parentupdate librw (diff)
downloadre3-ef47dad566db734b1efda862c414cf89af53d07e.tar
re3-ef47dad566db734b1efda862c414cf89af53d07e.tar.gz
re3-ef47dad566db734b1efda862c414cf89af53d07e.tar.bz2
re3-ef47dad566db734b1efda862c414cf89af53d07e.tar.lz
re3-ef47dad566db734b1efda862c414cf89af53d07e.tar.xz
re3-ef47dad566db734b1efda862c414cf89af53d07e.tar.zst
re3-ef47dad566db734b1efda862c414cf89af53d07e.zip
Diffstat (limited to '')
-rw-r--r--src/control/Pickups.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/control/Pickups.h b/src/control/Pickups.h
index d7d22174..dd5e60c6 100644
--- a/src/control/Pickups.h
+++ b/src/control/Pickups.h
@@ -34,21 +34,23 @@ class CPickup
{
public:
CVector m_vecPos;
- uint32 m_nRevenue;
+ float m_fRevenue;
CObject *m_pObject;
CObject *m_pExtraObject;
- uint16 m_nQuantity;
+ uint32 m_nQuantity;
uint32 m_nTimer;
- int16 m_nMoneySpeed;
+ uint16 m_nMoneySpeed;
int16 m_eModelIndex;
uint16 m_nIndex;
char m_sTextKey[8];
ePickupType m_eType;
bool m_bRemoved;
- uint8 m_effects;
+ uint8 m_effects:1;
+ uint8 m_effects2:1;
- CObject *GiveUsAPickUpObject(int32 handle);
+ CObject *GiveUsAPickUpObject(CObject **object, CObject **extraObject, int32 handle, int32 extraHandle);
bool Update(CPlayerPed *player, CVehicle *vehicle, int playerId);
+ void GetRidOfObjects();
private:
bool IsMine() { return m_eType >= PICKUP_MINE_INACTIVE && m_eType <= PICKUP_FLOATINGPACKAGE_FLOATING; }
inline bool CanBePickedUp(CPlayerPed *player, int playerId);
@@ -111,8 +113,7 @@ public:
static CVector StaticCamCoors;
static uint32 StaticCamStartTime;
-//TODO(MIAMI)
- static void RemoveAllPickupsOfACertainWeaponGroupWithNoAmmo(eWeaponType) {}
+ static void RemoveAllPickupsOfACertainWeaponGroupWithNoAmmo(eWeaponType);
};
extern uint16 AmmoForWeapon[20];