diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-12 11:13:32 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-12 11:13:32 +0200 |
| commit | e71b000cc5661f300ed761844bff54fae2865c4e (patch) | |
| tree | 7f2386e5a9dac9320a9c8c4d05c6f696786edbb6 /src/entities | |
| parent | scene init (diff) | |
| parent | obviously forgot about it (diff) | |
| download | re3-e71b000cc5661f300ed761844bff54fae2865c4e.tar re3-e71b000cc5661f300ed761844bff54fae2865c4e.tar.gz re3-e71b000cc5661f300ed761844bff54fae2865c4e.tar.bz2 re3-e71b000cc5661f300ed761844bff54fae2865c4e.tar.lz re3-e71b000cc5661f300ed761844bff54fae2865c4e.tar.xz re3-e71b000cc5661f300ed761844bff54fae2865c4e.tar.zst re3-e71b000cc5661f300ed761844bff54fae2865c4e.zip | |
Diffstat (limited to 'src/entities')
| -rw-r--r-- | src/entities/Entity.cpp | 4 | ||||
| -rw-r--r-- | src/entities/Entity.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp index 07d70394..25e5db48 100644 --- a/src/entities/Entity.cpp +++ b/src/entities/Entity.cpp @@ -62,11 +62,11 @@ CEntity::CEntity(void) bRemoveFromWorld = false; bHasHitWall = false; bImBeingRendered = false; - m_flagD8 = false; + bTouchingWater = false; bIsSubway = false; bDrawLast = false; bNoBrightHeadLights = false; - m_flagD80 = false; + bDoNotRender = false; bDistanceFade = false; m_flagE2 = false; diff --git a/src/entities/Entity.h b/src/entities/Entity.h index 99cc7f17..ca501ba4 100644 --- a/src/entities/Entity.h +++ b/src/entities/Entity.h @@ -73,11 +73,11 @@ public: uint32 bRemoveFromWorld : 1; uint32 bHasHitWall : 1; uint32 bImBeingRendered : 1; - uint32 m_flagD8 : 1; // used by cBuoyancy::ProcessBuoyancy + uint32 bTouchingWater : 1; // used by cBuoyancy::ProcessBuoyancy uint32 bIsSubway : 1; // set when subway, but maybe different meaning? uint32 bDrawLast : 1; uint32 bNoBrightHeadLights : 1; - uint32 m_flagD80 : 1; // CObject visibility? + uint32 bDoNotRender : 1; // flagsE uint32 bDistanceFade : 1; @@ -90,6 +90,7 @@ public: CReference *m_pFirstReference; CColModel *GetColModel(void) { return CModelInfo::GetModelInfo(m_modelIndex)->GetColModel(); } + uint32* GetAddressOfEntityProperties() { /* AWFUL */ return (uint32*)((char*)&m_rwObject + sizeof(m_rwObject)); } CEntity(void); ~CEntity(void); |