diff options
author | aap <aap@papnet.eu> | 2020-05-20 12:41:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-20 12:41:12 +0200 |
commit | fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b (patch) | |
tree | b32e29a80a2bb4c4692ed6dccef9b8c5e7f81185 /src/entities/Entity.h | |
parent | Merge pull request #568 from Nick007J/miami (diff) | |
parent | CEntity and friends (diff) | |
download | re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.gz re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.bz2 re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.lz re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.xz re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.tar.zst re3-fd4cd3e8f1599a62f70f4f2aa0931f7a82cf0f1b.zip |
Diffstat (limited to 'src/entities/Entity.h')
-rw-r--r-- | src/entities/Entity.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/entities/Entity.h b/src/entities/Entity.h index dc5378a5..ab7b6203 100644 --- a/src/entities/Entity.h +++ b/src/entities/Entity.h @@ -78,7 +78,7 @@ public: uint32 bIsSubway : 1; // set when subway, but maybe different meaning? uint32 bDrawLast : 1; // draw object last uint32 bNoBrightHeadLights : 1; - uint32 bDoNotRender : 1; + uint32 bDoNotRender : 1; //-- only applies to CObjects apparently uint32 bDistanceFade : 1; // Fade entity because it is far away // flagsE @@ -88,7 +88,7 @@ public: uint32 bIsStaticWaitingForCollision : 1; // this is used by script created entities - they are static until the collision is loaded below them uint32 m_flagE10 : 1; // probably bDontStream uint32 bUnderwater : 1; // this object is underwater change drawing order - uint32 m_flagE40 : 1; + uint32 bHasPreRenderEffects : 1; // Object has a prerender effects attached to it uint16 m_scanCode; uint16 m_randomSeed; @@ -112,12 +112,12 @@ public: #endif CEntity(void); - ~CEntity(void); + virtual ~CEntity(void); virtual void Add(void); virtual void Remove(void); - virtual void SetModelIndex(uint32 id) { m_modelIndex = id; CreateRwObject(); } - virtual void SetModelIndexNoCreate(uint32 id) { m_modelIndex = id; } + virtual void SetModelIndex(uint32 id); + virtual void SetModelIndexNoCreate(uint32 id); virtual void CreateRwObject(void); virtual void DeleteRwObject(void); virtual CRect GetBoundRect(void); @@ -160,6 +160,7 @@ public: int16 GetModelIndex(void) const { return m_modelIndex; } void UpdateRwFrame(void); void SetupBigBuilding(void); + bool HasPreRenderEffects(void); void AttachToRwObject(RwObject *obj); void DetachFromRwObject(void); |