summaryrefslogtreecommitdiffstats
path: root/src/peds
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-07-22 19:07:51 +0200
committerSergeanur <s.anureev@yandex.ua>2021-07-22 19:07:51 +0200
commit953e4fc4ff96e9e2c180f74b36e3b591c979b1e2 (patch)
treef3cc36cfeb0f14473ef84dc95f19a0b2b3983ba5 /src/peds
parentFix enum use (diff)
downloadre3-953e4fc4ff96e9e2c180f74b36e3b591c979b1e2.tar
re3-953e4fc4ff96e9e2c180f74b36e3b591c979b1e2.tar.gz
re3-953e4fc4ff96e9e2c180f74b36e3b591c979b1e2.tar.bz2
re3-953e4fc4ff96e9e2c180f74b36e3b591c979b1e2.tar.lz
re3-953e4fc4ff96e9e2c180f74b36e3b591c979b1e2.tar.xz
re3-953e4fc4ff96e9e2c180f74b36e3b591c979b1e2.tar.zst
re3-953e4fc4ff96e9e2c180f74b36e3b591c979b1e2.zip
Diffstat (limited to 'src/peds')
-rw-r--r--src/peds/Ped.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index cad10d8a..b52d054c 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -3009,7 +3009,7 @@ CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints)
lowerSpeedLimit *= 1.5f;
}
CAnimBlendAssociation *fallAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_STD_FALL);
- if (!bWasStanding && speed > upperSpeedLimit && (!bPushedAlongByCar || m_vecMoveSpeed.z < lowerSpeedLimit)
+ if (!bWasStanding && ((speed > upperSpeedLimit && !bPushedAlongByCar) || (m_vecMoveSpeed.z < lowerSpeedLimit))
&& m_pCollidingEntity != collidingEnt) {
float damage = 100.0f * Max(speed - 0.25f, 0.0f);