diff options
| author | Fire_Head <Fire-Head@users.noreply.github.com> | 2019-06-13 02:47:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-13 02:47:13 +0200 |
| commit | 9689def6a59bd8a1d05860c7d23f1837cf3b4a80 (patch) | |
| tree | cbd5cdfcb16bb993ca4b75552a48eab641541b77 /src/entities/Object.h | |
| parent | Update Replay.h (diff) | |
| parent | silly mistake (diff) | |
| download | re3-9689def6a59bd8a1d05860c7d23f1837cf3b4a80.tar re3-9689def6a59bd8a1d05860c7d23f1837cf3b4a80.tar.gz re3-9689def6a59bd8a1d05860c7d23f1837cf3b4a80.tar.bz2 re3-9689def6a59bd8a1d05860c7d23f1837cf3b4a80.tar.lz re3-9689def6a59bd8a1d05860c7d23f1837cf3b4a80.tar.xz re3-9689def6a59bd8a1d05860c7d23f1837cf3b4a80.tar.zst re3-9689def6a59bd8a1d05860c7d23f1837cf3b4a80.zip | |
Diffstat (limited to 'src/entities/Object.h')
| -rw-r--r-- | src/entities/Object.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/entities/Object.h b/src/entities/Object.h index d71b155e..c9800e20 100644 --- a/src/entities/Object.h +++ b/src/entities/Object.h @@ -6,6 +6,7 @@ enum { GAME_OBJECT = 1, MISSION_OBJECT = 2, TEMP_OBJECT = 3, + CUTSCENE_OBJECT = 4, }; class CVehicle; @@ -22,7 +23,7 @@ public: int8 m_obj_flag8 : 1; int8 m_obj_flag10 : 1; int8 bHasBeenDamaged : 1; - int8 m_obj_flag40 : 1; + int8 bUseVehicleColours : 1; int8 m_obj_flag80 : 1; int8 field_172; int8 field_173; @@ -43,9 +44,19 @@ public: CEntity *m_pCollidingEntity; int8 m_colour1, m_colour2; + static int16 &nNoTempObjects; + static void *operator new(size_t); static void operator delete(void*, size_t); + CObject(void); + ~CObject(void); + + void Render(void); + void ObjectDamage(float amount); + + + void Render_(void) { CObject::Render(); } }; static_assert(sizeof(CObject) == 0x198, "CObject: error"); |