diff options
| author | Fire_Head <Fire-Head@users.noreply.github.com> | 2019-07-24 20:00:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-24 20:00:08 +0200 |
| commit | 81ee1c509a8d05189901dd59c268bf47a6188eb8 (patch) | |
| tree | d836f70678f2ce7b5d86a6745f34b45232ff71d0 /src/entities/Entity.cpp | |
| parent | update (diff) | |
| parent | Merge branch 'master' into master (diff) | |
| download | re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.tar re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.tar.gz re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.tar.bz2 re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.tar.lz re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.tar.xz re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.tar.zst re3-81ee1c509a8d05189901dd59c268bf47a6188eb8.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/entities/Entity.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp index 0749e8e7..b795931f 100644 --- a/src/entities/Entity.cpp +++ b/src/entities/Entity.cpp @@ -13,11 +13,11 @@ #include "Glass.h" #include "Clock.h" #include "Weather.h" -#include "TimeCycle.h" +#include "Timecycle.h" #include "Bridge.h" #include "TrafficLights.h" #include "Coronas.h" -#include "Pointlights.h" +#include "PointLights.h" #include "Shadows.h" #include "Pickups.h" #include "SpecialFX.h" @@ -42,7 +42,7 @@ CEntity::CEntity(void) bUseCollisionRecords = false; bWasPostponed = false; - m_flagB2 = false; + bExplosionProof = false; bIsVisible = true; bHasCollided = false; bRenderScorched = false; @@ -535,7 +535,7 @@ CEntity::ResolveReferences(void) for(ref = m_pFirstReference; ref->next; ref = ref->next) ; ref->next = CReferences::pEmptyList; - CReferences::pEmptyList = ref; + CReferences::pEmptyList = m_pFirstReference; m_pFirstReference = nil; } } |