summaryrefslogtreecommitdiffstats
path: root/src/entities
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-06 17:13:46 +0200
committeraap <aap@papnet.eu>2020-05-06 17:13:46 +0200
commita2b89c6a18d43910e9626c23793a4935e2c0d08d (patch)
treeb22ba4ad99611ddf75da0d13a6007be422ec729e /src/entities
parentgot rid of superfluous enum (diff)
downloadre3-a2b89c6a18d43910e9626c23793a4935e2c0d08d.tar
re3-a2b89c6a18d43910e9626c23793a4935e2c0d08d.tar.gz
re3-a2b89c6a18d43910e9626c23793a4935e2c0d08d.tar.bz2
re3-a2b89c6a18d43910e9626c23793a4935e2c0d08d.tar.lz
re3-a2b89c6a18d43910e9626c23793a4935e2c0d08d.tar.xz
re3-a2b89c6a18d43910e9626c23793a4935e2c0d08d.tar.zst
re3-a2b89c6a18d43910e9626c23793a4935e2c0d08d.zip
Diffstat (limited to 'src/entities')
-rw-r--r--src/entities/Physical.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp
index dd49ea3e..790a8be7 100644
--- a/src/entities/Physical.cpp
+++ b/src/entities/Physical.cpp
@@ -1847,7 +1847,7 @@ CPhysical::ProcessCollision(void)
step = savedTimeStep / n;
}else if(IsObject()){
int responsecase = ((CObject*)this)->m_nSpecialCollisionResponseCases;
- if(responsecase == COLLRESPONSE_CHANGE_MODEL){
+ if(responsecase == COLLRESPONSE_LAMPOST){
CVector speedUp = { 0.0f, 0.0f, 0.0f };
CVector speedDown = { 0.0f, 0.0f, 0.0f };
speedUp.z = GetBoundRadius();
@@ -1866,7 +1866,7 @@ CPhysical::ProcessCollision(void)
n = NUMSTEPS(0.09f);
step = savedTimeStep / n;
}
- }else if(responsecase == COLLRESPONSE_SPLIT_MODEL || responsecase == COLLRESPONSE_CHANGE_THEN_SMASH){
+ }else if(responsecase == COLLRESPONSE_SMALLBOX || responsecase == COLLRESPONSE_FENCEPART){
if(distSq >= sq(0.15f)){
n = NUMSTEPS(0.15f);
step = savedTimeStep / n;