diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-15 22:31:52 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-15 22:31:52 +0200 |
commit | 1795f3d47993e7a9833e6f265bb91fb6ce400f1c (patch) | |
tree | 766dd0f14ba4df90cbac836c03cdfc501c9cd009 /src/core/Collision.cpp | |
parent | fix (diff) | |
parent | Merge pull request #440 from Fire-Head/master (diff) | |
download | re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.tar re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.tar.gz re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.tar.bz2 re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.tar.lz re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.tar.xz re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.tar.zst re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.zip |
Diffstat (limited to 'src/core/Collision.cpp')
-rw-r--r-- | src/core/Collision.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp index c884f751..85145e86 100644 --- a/src/core/Collision.cpp +++ b/src/core/Collision.cpp @@ -31,8 +31,8 @@ enum Direction DIR_Z_NEG, }; -eLevelName &CCollision::ms_collisionInMemory = *(eLevelName*)0x8F6250; -CLinkList<CColModel*> &CCollision::ms_colModelCache = *(CLinkList<CColModel*>*)0x95CB58; +eLevelName CCollision::ms_collisionInMemory; +CLinkList<CColModel*> CCollision::ms_colModelCache; void CCollision::Init(void) @@ -1355,6 +1355,7 @@ CCollision::ProcessColModels(const CMatrix &matrixA, CColModel &modelA, modelB.triangles[aTriangleIndicesB[j]], modelB.trianglePlanes[aTriangleIndicesB[j]], spherepoints[numCollisions], coldist); + if(hasCollided) numCollisions++; } |