diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-10-06 13:26:50 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-10-06 13:26:50 +0200 |
| commit | e10f5ee6a3f94a5ff2559f868c884e47d4628271 (patch) | |
| tree | 3b2a2ceafc26e4215b49bf56e75cf80568251f26 /src/objects/Object.h | |
| parent | car AI (diff) | |
| parent | Fixed player blip heading when looking left/right/behind (diff) | |
| download | re3-e10f5ee6a3f94a5ff2559f868c884e47d4628271.tar re3-e10f5ee6a3f94a5ff2559f868c884e47d4628271.tar.gz re3-e10f5ee6a3f94a5ff2559f868c884e47d4628271.tar.bz2 re3-e10f5ee6a3f94a5ff2559f868c884e47d4628271.tar.lz re3-e10f5ee6a3f94a5ff2559f868c884e47d4628271.tar.xz re3-e10f5ee6a3f94a5ff2559f868c884e47d4628271.tar.zst re3-e10f5ee6a3f94a5ff2559f868c884e47d4628271.zip | |
Diffstat (limited to 'src/objects/Object.h')
| -rw-r--r-- | src/objects/Object.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/objects/Object.h b/src/objects/Object.h index 21348b52..47af4fbf 100644 --- a/src/objects/Object.h +++ b/src/objects/Object.h @@ -34,13 +34,13 @@ public: int8 ObjectCreatedBy; int8 bIsPickup : 1; int8 m_obj_flag2 : 1; - int8 m_obj_flag4 : 1; + int8 bOutOfStock : 1; int8 m_obj_flag8 : 1; int8 m_obj_flag10 : 1; int8 bHasBeenDamaged : 1; int8 bUseVehicleColours : 1; int8 m_obj_flag80 : 1; - int8 field_172; + int8 field_172; // car for a bonus pickup? int8 field_173; float m_fCollisionDamageMultiplier; uint8 m_nCollisionDamageEffect; @@ -63,7 +63,9 @@ public: static int16 &nBodyCastHealth; static void *operator new(size_t); + static void *operator new(size_t, int); static void operator delete(void*, size_t); + static void operator delete(void*, int); CObject(void); CObject(int32, bool); |