summaryrefslogtreecommitdiffstats
path: root/src/entities/Entity.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-19 20:56:42 +0200
committeraap <aap@papnet.eu>2020-05-19 20:56:42 +0200
commitbdbe5d1080066073f063d653e80df6dbf4b326a2 (patch)
treebc4f8fd0f648bc38789591efe73d661ed2981998 /src/entities/Entity.h
parentMerge pull request #564 from Xinerki/miami (diff)
downloadre3-bdbe5d1080066073f063d653e80df6dbf4b326a2.tar
re3-bdbe5d1080066073f063d653e80df6dbf4b326a2.tar.gz
re3-bdbe5d1080066073f063d653e80df6dbf4b326a2.tar.bz2
re3-bdbe5d1080066073f063d653e80df6dbf4b326a2.tar.lz
re3-bdbe5d1080066073f063d653e80df6dbf4b326a2.tar.xz
re3-bdbe5d1080066073f063d653e80df6dbf4b326a2.tar.zst
re3-bdbe5d1080066073f063d653e80df6dbf4b326a2.zip
Diffstat (limited to 'src/entities/Entity.h')
-rw-r--r--src/entities/Entity.h11
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);