diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2019-10-04 00:18:47 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2019-10-04 00:18:47 +0200 |
| commit | 6b4f6e05e2612af715246de58c28128d358b6916 (patch) | |
| tree | dc2490e7fd6dc7123991840401048c06da6cd3ec /src/objects/Object.h | |
| parent | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun (diff) | |
| parent | Fixed disappearing ammo count (diff) | |
| download | re3-6b4f6e05e2612af715246de58c28128d358b6916.tar re3-6b4f6e05e2612af715246de58c28128d358b6916.tar.gz re3-6b4f6e05e2612af715246de58c28128d358b6916.tar.bz2 re3-6b4f6e05e2612af715246de58c28128d358b6916.tar.lz re3-6b4f6e05e2612af715246de58c28128d358b6916.tar.xz re3-6b4f6e05e2612af715246de58c28128d358b6916.tar.zst re3-6b4f6e05e2612af715246de58c28128d358b6916.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); |