diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-06 19:32:57 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-06 19:32:57 +0300 |
| commit | 6ad66fb2d78360053febb3369a7ec448ffec73fd (patch) | |
| tree | 6c0f21a5f8ecc2cb7facd55f3944b65c1c3a6d0e /src/peds/Ped.cpp | |
| parent | f1c1f56b1268b900a01a479f9ad67cd92e63eb52 (diff) | |
| parent | 3895853fe7b2aab0fb88d144d598ebf853f35020 (diff) | |
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/render/Renderer.cpp
Diffstat (limited to 'src/peds/Ped.cpp')
| -rw-r--r-- | src/peds/Ped.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 0a0a807d..042596de 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -14853,11 +14853,11 @@ CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints) if (!collidingEnt->IsBuilding()) ((CPhysical*)collidingEnt)->AddCollisionRecord(this); - if (ourCollidedSpheres > 0 && (collidingEnt->IsBuilding() || collidingEnt->bIsStatic)) { + if (ourCollidedSpheres > 0 && (collidingEnt->IsBuilding() || collidingEnt->IsStatic())) { bHasHitWall = true; } } - if (collidingEnt->IsBuilding() || collidingEnt->bIsStatic) { + if (collidingEnt->IsBuilding() || collidingEnt->IsStatic()) { if (bWasStanding) { CVector sphereNormal; |