diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-04-18 05:03:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-18 05:03:15 +0200 |
| commit | 8633556579a5f11f360c3f62b1f50ddd89d7a7fb (patch) | |
| tree | 80abd8e23bf4aad86e34a942c9cde8a69069653b /src/peds | |
| parent | Merge branch 'master' of github.com:gtamodding/re3 (diff) | |
| parent | Various fixes (diff) | |
| download | re3-8633556579a5f11f360c3f62b1f50ddd89d7a7fb.tar re3-8633556579a5f11f360c3f62b1f50ddd89d7a7fb.tar.gz re3-8633556579a5f11f360c3f62b1f50ddd89d7a7fb.tar.bz2 re3-8633556579a5f11f360c3f62b1f50ddd89d7a7fb.tar.lz re3-8633556579a5f11f360c3f62b1f50ddd89d7a7fb.tar.xz re3-8633556579a5f11f360c3f62b1f50ddd89d7a7fb.tar.zst re3-8633556579a5f11f360c3f62b1f50ddd89d7a7fb.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/peds/Population.cpp | 6 |
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; } } |