diff options
| author | aap <aap@papnet.eu> | 2020-05-06 17:13:46 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-06 17:14:34 +0200 |
| commit | c11912a8ecf13bb664d8ee3dba1ac55eb363176f (patch) | |
| tree | 7fc7cfc90b7e9a0f67ceed13721f53cefecdea78 /src/entities/Physical.cpp | |
| parent | Merge branch 'master' into miami (diff) | |
| download | re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.tar re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.tar.gz re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.tar.bz2 re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.tar.lz re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.tar.xz re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.tar.zst re3-c11912a8ecf13bb664d8ee3dba1ac55eb363176f.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/entities/Physical.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp index 3f1ec325..fe270645 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; |