diff options
author | aap <aap@papnet.eu> | 2019-06-12 20:07:37 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2019-06-12 20:11:17 +0200 |
commit | a9517c01afad50d90c3afdee0fdc6238158378f2 (patch) | |
tree | 9226e392b0869576faccd8a3d66d68490d648417 /src/entities/Object.h | |
parent | Merge branch 'master' into master (diff) | |
download | re3-a9517c01afad50d90c3afdee0fdc6238158378f2.tar re3-a9517c01afad50d90c3afdee0fdc6238158378f2.tar.gz re3-a9517c01afad50d90c3afdee0fdc6238158378f2.tar.bz2 re3-a9517c01afad50d90c3afdee0fdc6238158378f2.tar.lz re3-a9517c01afad50d90c3afdee0fdc6238158378f2.tar.xz re3-a9517c01afad50d90c3afdee0fdc6238158378f2.tar.zst re3-a9517c01afad50d90c3afdee0fdc6238158378f2.zip |
Diffstat (limited to '')
-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"); |