diff options
| author | erorcun <erayorcunus@gmail.com> | 2019-10-01 19:15:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-01 19:15:02 +0200 |
| commit | 10e42d7d66b8f467e8b2cf7ba2c48610ff1669c2 (patch) | |
| tree | 9272a6aa01da4dd060c970ee92759c00137e2a6b /src | |
| parent | Merge pull request #213 from Sergeanur/PlayerSkin (diff) | |
| parent | Fix CPickup (diff) | |
| download | re3-10e42d7d66b8f467e8b2cf7ba2c48610ff1669c2.tar re3-10e42d7d66b8f467e8b2cf7ba2c48610ff1669c2.tar.gz re3-10e42d7d66b8f467e8b2cf7ba2c48610ff1669c2.tar.bz2 re3-10e42d7d66b8f467e8b2cf7ba2c48610ff1669c2.tar.lz re3-10e42d7d66b8f467e8b2cf7ba2c48610ff1669c2.tar.xz re3-10e42d7d66b8f467e8b2cf7ba2c48610ff1669c2.tar.zst re3-10e42d7d66b8f467e8b2cf7ba2c48610ff1669c2.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/control/Pickups.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/control/Pickups.h b/src/control/Pickups.h index 8c2014d6..5b51a52a 100644 --- a/src/control/Pickups.h +++ b/src/control/Pickups.h @@ -1,7 +1,7 @@ #pragma once #include "Weapon.h" -enum ePickupType +enum ePickupType : uint8 { PICKUP_NONE = 0, PICKUP_IN_SHOP = 1, @@ -25,7 +25,8 @@ class CObject; class CPickup { - ePickupType m_eType; + ePickupType m_eType;
+ bool m_bRemoved; uint16 m_wQuantity; CObject *m_pObject; uint32 m_nTimer; @@ -34,6 +35,8 @@ class CPickup CVector m_vecPos; }; +static_assert(sizeof(CPickup) == 0x1C, "CPickup: error"); + class CPickups { public: |