diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-12 01:00:26 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-12 01:00:26 +0200 |
| commit | 9647587447fc7006d4a475952e62e47264832c9f (patch) | |
| tree | 20e8b8da9178b945c6b265868277c8afffdbae59 /src/entities | |
| parent | more script (diff) | |
| parent | Merge pull request #535 from Nick007J/miami (diff) | |
| download | re3-9647587447fc7006d4a475952e62e47264832c9f.tar re3-9647587447fc7006d4a475952e62e47264832c9f.tar.gz re3-9647587447fc7006d4a475952e62e47264832c9f.tar.bz2 re3-9647587447fc7006d4a475952e62e47264832c9f.tar.lz re3-9647587447fc7006d4a475952e62e47264832c9f.tar.xz re3-9647587447fc7006d4a475952e62e47264832c9f.tar.zst re3-9647587447fc7006d4a475952e62e47264832c9f.zip | |
Diffstat (limited to 'src/entities')
| -rw-r--r-- | src/entities/Entity.cpp | 2 | ||||
| -rw-r--r-- | src/entities/Entity.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp index 1e00b129..6f8ebcb4 100644 --- a/src/entities/Entity.cpp +++ b/src/entities/Entity.cpp @@ -77,7 +77,7 @@ CEntity::CEntity(void) bOffscreen = false; bIsStaticWaitingForCollision = false; m_flagE10 = false; - m_flagE20 = false; + bUnderwater = false; m_flagE40 = false; m_scanCode = 0; diff --git a/src/entities/Entity.h b/src/entities/Entity.h index b8f8c80c..fa57519e 100644 --- a/src/entities/Entity.h +++ b/src/entities/Entity.h @@ -86,8 +86,8 @@ public: uint32 m_flagE2 : 1; uint32 bOffscreen : 1; // offscreen flag. This can only be trusted when it is set to true uint32 bIsStaticWaitingForCollision : 1; // this is used by script created entities - they are static until the collision is loaded below them - uint32 m_flagE10 : 1; - uint32 m_flagE20 : 1; + uint32 m_flagE10 : 1; // probably bDontStream + uint32 bUnderwater : 1; // this object is underwater change drawing order uint32 m_flagE40 : 1; uint16 m_scanCode; |