summaryrefslogtreecommitdiffstats
path: root/src/peds/Population.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-04-18 04:58:43 +0200
committereray orçunus <erayorcunus@gmail.com>2020-04-18 04:58:43 +0200
commit812b9e7edab26cc04d28931b0e89ed9317b818c9 (patch)
tree80abd8e23bf4aad86e34a942c9cde8a69069653b /src/peds/Population.cpp
parentMerge branch 'master' of github.com:gtamodding/re3 (diff)
downloadre3-812b9e7edab26cc04d28931b0e89ed9317b818c9.tar
re3-812b9e7edab26cc04d28931b0e89ed9317b818c9.tar.gz
re3-812b9e7edab26cc04d28931b0e89ed9317b818c9.tar.bz2
re3-812b9e7edab26cc04d28931b0e89ed9317b818c9.tar.lz
re3-812b9e7edab26cc04d28931b0e89ed9317b818c9.tar.xz
re3-812b9e7edab26cc04d28931b0e89ed9317b818c9.tar.zst
re3-812b9e7edab26cc04d28931b0e89ed9317b818c9.zip
Diffstat (limited to '')
-rw-r--r--src/peds/Population.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp
index 681c6b1a..c1eee828 100644
--- a/src/peds/Population.cpp
+++ b/src/peds/Population.cpp
@@ -1050,7 +1050,7 @@ CPopulation::TestSafeForRealObject(CDummyObject *dummy)
if (maxY >= NUMSECTORS_Y) maxY = NUMSECTORS_Y;
#endif
- static CColPoint aTempColPoints;
+ static CColPoint aTempColPoints[MAX_COLLISION_POINTS];
for (int curY = minY; curY <= maxY; curY++) {
for (int curX = minX; curX <= maxX; curX++) {
@@ -1061,7 +1061,7 @@ CPopulation::TestSafeForRealObject(CDummyObject *dummy)
if (veh->m_scanCode != CWorld::GetCurrentScanCode()) {
if (veh->GetIsTouching(colCentre, colRadius)) {
veh->m_scanCode = CWorld::GetCurrentScanCode();
- if (CCollision::ProcessColModels(dummy->GetMatrix(), *dummyCol, veh->GetMatrix(), *veh->GetColModel(), &aTempColPoints, nil, nil) > 0)
+ if (CCollision::ProcessColModels(dummy->GetMatrix(), *dummyCol, veh->GetMatrix(), *veh->GetColModel(), aTempColPoints, nil, nil) > 0)
return false;
}
}
@@ -1072,7 +1072,7 @@ CPopulation::TestSafeForRealObject(CDummyObject *dummy)
if (veh->m_scanCode != CWorld::GetCurrentScanCode()) {
if (veh->GetIsTouching(colCentre, colRadius)) {
veh->m_scanCode = CWorld::GetCurrentScanCode();
- if (CCollision::ProcessColModels(dummy->GetMatrix(), *dummyCol, veh->GetMatrix(), *veh->GetColModel(), &aTempColPoints, nil, nil) > 0)
+ if (CCollision::ProcessColModels(dummy->GetMatrix(), *dummyCol, veh->GetMatrix(), *veh->GetColModel(), aTempColPoints, nil, nil) > 0)
return false;
}
}