summaryrefslogtreecommitdiffstats
path: root/src/core/Collision.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-04-15 18:19:45 +0200
committereray orçunus <erayorcunus@gmail.com>2020-04-15 18:19:45 +0200
commit4da1879975ef28cb7f406166d62d154d03ef47d2 (patch)
tree42f2049c82fdd99386ce7346294482ed52940520 /src/core/Collision.cpp
parentfix CTheCarGenerators::SaveAllCarGenerators (diff)
downloadre3-4da1879975ef28cb7f406166d62d154d03ef47d2.tar
re3-4da1879975ef28cb7f406166d62d154d03ef47d2.tar.gz
re3-4da1879975ef28cb7f406166d62d154d03ef47d2.tar.bz2
re3-4da1879975ef28cb7f406166d62d154d03ef47d2.tar.lz
re3-4da1879975ef28cb7f406166d62d154d03ef47d2.tar.xz
re3-4da1879975ef28cb7f406166d62d154d03ef47d2.tar.zst
re3-4da1879975ef28cb7f406166d62d154d03ef47d2.zip
Diffstat (limited to 'src/core/Collision.cpp')
-rw-r--r--src/core/Collision.cpp5
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++;
}