summaryrefslogtreecommitdiffstats
path: root/src/entities/Physical.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-23 13:11:41 +0200
committeraap <aap@papnet.eu>2019-06-23 13:11:41 +0200
commita5ba53896881ec479f9819ab0349437de4c3f4ed (patch)
tree89471ebfcd3b95fdb3b35a13bcdb605d27694973 /src/entities/Physical.cpp
parentfixed key binding, head shots, freezes (diff)
downloadre3-a5ba53896881ec479f9819ab0349437de4c3f4ed.tar
re3-a5ba53896881ec479f9819ab0349437de4c3f4ed.tar.gz
re3-a5ba53896881ec479f9819ab0349437de4c3f4ed.tar.bz2
re3-a5ba53896881ec479f9819ab0349437de4c3f4ed.tar.lz
re3-a5ba53896881ec479f9819ab0349437de4c3f4ed.tar.xz
re3-a5ba53896881ec479f9819ab0349437de4c3f4ed.tar.zst
re3-a5ba53896881ec479f9819ab0349437de4c3f4ed.zip
Diffstat (limited to 'src/entities/Physical.cpp')
-rw-r--r--src/entities/Physical.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp
index adc53525..b35b2d11 100644
--- a/src/entities/Physical.cpp
+++ b/src/entities/Physical.cpp
@@ -1504,7 +1504,7 @@ CPhysical::ProcessCollisionSectorList(CPtrList *lists)
else if(A->GetUp().z > 0.3f)
adhesion = 0.0f;
else
- adhesion *= max(5.0f, 0.03f*impulseA + 1.0f);
+ adhesion *= min(5.0f, 0.03f*impulseA + 1.0f);
}
if(A->ApplyFriction(adhesion, aColPoints[i]))