diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-04-15 18:22:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-15 18:22:28 +0200 |
| commit | 647cfbfd4554e975825fa48e1a87ea286704fc21 (patch) | |
| tree | e3d7a2d0164ab5c0a7bc19617d2bbfa25bc1e2a1 /src/core/Collision.cpp | |
| parent | fixed bug and weirdness in CHeli (diff) | |
| parent | Many fixes and cleanup (diff) | |
| download | re3-647cfbfd4554e975825fa48e1a87ea286704fc21.tar re3-647cfbfd4554e975825fa48e1a87ea286704fc21.tar.gz re3-647cfbfd4554e975825fa48e1a87ea286704fc21.tar.bz2 re3-647cfbfd4554e975825fa48e1a87ea286704fc21.tar.lz re3-647cfbfd4554e975825fa48e1a87ea286704fc21.tar.xz re3-647cfbfd4554e975825fa48e1a87ea286704fc21.tar.zst re3-647cfbfd4554e975825fa48e1a87ea286704fc21.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++; } |