diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-05 23:21:26 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-05 23:21:26 +0200 |
| commit | 35bf340401354f0c9af9efe88ae425bfd9e1b145 (patch) | |
| tree | 627ac266b96acbabda3dc2e9b5cf95801ca7b199 /src/entities/Entity.h | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| download | re3-35bf340401354f0c9af9efe88ae425bfd9e1b145.tar re3-35bf340401354f0c9af9efe88ae425bfd9e1b145.tar.gz re3-35bf340401354f0c9af9efe88ae425bfd9e1b145.tar.bz2 re3-35bf340401354f0c9af9efe88ae425bfd9e1b145.tar.lz re3-35bf340401354f0c9af9efe88ae425bfd9e1b145.tar.xz re3-35bf340401354f0c9af9efe88ae425bfd9e1b145.tar.zst re3-35bf340401354f0c9af9efe88ae425bfd9e1b145.zip | |
Diffstat (limited to 'src/entities/Entity.h')
| -rw-r--r-- | src/entities/Entity.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/entities/Entity.h b/src/entities/Entity.h index e821550a..e85e40f7 100644 --- a/src/entities/Entity.h +++ b/src/entities/Entity.h @@ -84,7 +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 + uint32 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; @@ -99,7 +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; } + bool IsStatic(void) { return bIsStatic || bIsStaticWaitingForCollision; } #ifdef COMPATIBLE_SAVES void SaveEntityFlags(uint8*& buf); void LoadEntityFlags(uint8*& buf); |