diff options
| author | aap <aap@papnet.eu> | 2020-04-15 22:36:21 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-04-15 22:36:21 +0200 |
| commit | afce2e1bb3212a01efe0205313cf5d632eee8a20 (patch) | |
| tree | e9602e11ba49ad3cd35c0af4355eec330d73aa8b /src/core/Collision.cpp | |
| parent | implemented most of librw wrapper (diff) | |
| parent | Merge pull request #440 from Fire-Head/master (diff) | |
| download | re3-afce2e1bb3212a01efe0205313cf5d632eee8a20.tar re3-afce2e1bb3212a01efe0205313cf5d632eee8a20.tar.gz re3-afce2e1bb3212a01efe0205313cf5d632eee8a20.tar.bz2 re3-afce2e1bb3212a01efe0205313cf5d632eee8a20.tar.lz re3-afce2e1bb3212a01efe0205313cf5d632eee8a20.tar.xz re3-afce2e1bb3212a01efe0205313cf5d632eee8a20.tar.zst re3-afce2e1bb3212a01efe0205313cf5d632eee8a20.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++; } |