summaryrefslogtreecommitdiffstats
path: root/src/entities
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-06 18:04:52 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-06 18:04:52 +0200
commitd5e76471ae48bd3a31edb987d1c5366e7a67b3e2 (patch)
tree07a8ff3df033c62c58b6d27dfb94227e92b384c9 /src/entities
parentMerge remote-tracking branch 'upstream/miami' into miami (diff)
parentCSphere and CBox for CColModel (diff)
downloadre3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.tar
re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.tar.gz
re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.tar.bz2
re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.tar.lz
re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.tar.xz
re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.tar.zst
re3-d5e76471ae48bd3a31edb987d1c5366e7a67b3e2.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 17a39070..bbe69167 100644
--- a/src/entities/Physical.cpp
+++ b/src/entities/Physical.cpp
@@ -1837,7 +1837,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();
@@ -1856,7 +1856,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;