diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-05 20:45:43 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-05 20:45:43 +0200 |
| commit | 1291dd534bad0d3a875ad253cc7500221faa1b31 (patch) | |
| tree | 5af47634abe7b6c7c96b9b9f74f1e0236198d424 /src/entities | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| download | re3-1291dd534bad0d3a875ad253cc7500221faa1b31.tar re3-1291dd534bad0d3a875ad253cc7500221faa1b31.tar.gz re3-1291dd534bad0d3a875ad253cc7500221faa1b31.tar.bz2 re3-1291dd534bad0d3a875ad253cc7500221faa1b31.tar.lz re3-1291dd534bad0d3a875ad253cc7500221faa1b31.tar.xz re3-1291dd534bad0d3a875ad253cc7500221faa1b31.tar.zst re3-1291dd534bad0d3a875ad253cc7500221faa1b31.zip | |
Diffstat (limited to 'src/entities')
| -rw-r--r-- | src/entities/Entity.cpp | 2 | ||||
| -rw-r--r-- | src/entities/Entity.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp index 453ee806..830a0574 100644 --- a/src/entities/Entity.cpp +++ b/src/entities/Entity.cpp @@ -74,6 +74,8 @@ CEntity::CEntity(void) bDistanceFade = false; m_flagE2 = false; + m_bIsStaticWaitingForCollision = false; + m_scanCode = 0; m_modelIndex = -1; m_rwObject = nil; diff --git a/src/entities/Entity.h b/src/entities/Entity.h index 0534de27..e821550a 100644 --- a/src/entities/Entity.h +++ b/src/entities/Entity.h @@ -84,6 +84,7 @@ public: // flagsE uint32 m_flagE2 : 1; // TODO(MIAMI) + uint32 m_bIsStaticWaitingForCollision : 1; // this is used by script created entities - they are static until the collision is loaded below them uint16 m_scanCode; uint16 m_randomSeed; @@ -98,6 +99,7 @@ public: eEntityStatus GetStatus() const { return (eEntityStatus)m_status; } void SetStatus(eEntityStatus status) { m_status = status; } CColModel *GetColModel(void) { return CModelInfo::GetModelInfo(m_modelIndex)->GetColModel(); } + bool IsStatic(void) { return bIsStatic && m_bIsStaticWaitingForCollision; } #ifdef COMPATIBLE_SAVES void SaveEntityFlags(uint8*& buf); void LoadEntityFlags(uint8*& buf); |