summaryrefslogtreecommitdiffstats
path: root/src/peds/Population.cpp
diff options
context:
space:
mode:
authorFilip Gawin <filip.gawin@zoho.com>2020-04-18 12:08:38 +0200
committerFilip Gawin <filip.gawin@zoho.com>2020-04-18 12:08:38 +0200
commit2b1570de703c32ab43c979c286413a3a1c5e3dc0 (patch)
treeff5510329a08fd5b3dca88de1c9fc5e36abef1b9 /src/peds/Population.cpp
parentPart one (diff)
parentZones save/load (diff)
downloadre3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.tar
re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.tar.gz
re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.tar.bz2
re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.tar.lz
re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.tar.xz
re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.tar.zst
re3-2b1570de703c32ab43c979c286413a3a1c5e3dc0.zip
Diffstat (limited to 'src/peds/Population.cpp')
-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;
}
}