diff options
| author | aap <aap@papnet.eu> | 2020-05-22 23:55:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-22 23:55:29 +0200 |
| commit | 8fb72afac96434153d948d91685f7291e9b946d9 (patch) | |
| tree | 25d4899924a591e4dafd44caf488dd9bf62db95e /src/core/ColStore.cpp | |
| parent | Merge pull request #579 from Xinerki/miami (diff) | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| download | re3-8fb72afac96434153d948d91685f7291e9b946d9.tar re3-8fb72afac96434153d948d91685f7291e9b946d9.tar.gz re3-8fb72afac96434153d948d91685f7291e9b946d9.tar.bz2 re3-8fb72afac96434153d948d91685f7291e9b946d9.tar.lz re3-8fb72afac96434153d948d91685f7291e9b946d9.tar.xz re3-8fb72afac96434153d948d91685f7291e9b946d9.tar.zst re3-8fb72afac96434153d948d91685f7291e9b946d9.zip | |
Diffstat (limited to 'src/core/ColStore.cpp')
| -rw-r--r-- | src/core/ColStore.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ColStore.cpp b/src/core/ColStore.cpp index 80bbdc77..070967e5 100644 --- a/src/core/ColStore.cpp +++ b/src/core/ColStore.cpp @@ -178,7 +178,7 @@ CColStore::LoadCollision(const CVector2D &pos) }else{ for (int j = 0; j < MAX_CLEANUP; j++) { CPhysical* pEntity = CTheScripts::MissionCleanup.DoesThisEntityWaitForCollision(j); - if (pEntity /* !pEntity->bDontLoadCollision && !pEntity->bIsFrozen */) { + if (pEntity && !pEntity->bDontLoadCollision && !pEntity->bIsFrozen) { if (GetBoundingBox(i).IsPointInside(pEntity->GetPosition(), -80.0f)) wantThisOne = true; } |