AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 15:47:46 +00:00
Code Issues Projects Releases Wiki Activity

More bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2019-01-30 21:52:21 -10:00
parent c3d8afa852
commit 7d29c6e25a
9 changed files with 86 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/World/CPathFindArea.cpp
View File

@@ -204,7 +204,7 @@ CPFRegion* CPFArea::FindClosestRegion(const zeus::CVector3f& point, u32 flags, u
CPFRegion* ret = nullptr;
for (rstl::prereserved_vector<CPFRegion*>* list : regionListList) {
for (CPFRegion* region : *list) {
if (region->Data()->GetCookie() != x34_curCookie) {
if (region->Data()->GetCookie() != x34_regionFindCookie) {
if (region->GetFlags() & 0xff & flags && (region->GetFlags() >> 16) & 0xff & indexMask &&
region->IsPointInsidePaddedAABox(point, padding) && (isFlyer || region->PointHeight(point) < 3.f)) {
if (region->FindBestPoint(x10_tmpPolyPoints, point, flags, padding * padding)) {
@@ -215,10 +215,11 @@ CPFRegion* CPFArea::FindClosestRegion(const zeus::CVector3f& point, u32 flags, u
x4_closestPoint = region->Data()->GetBestPoint();
}
}
region->Data()->SetCookie(x34_curCookie);
region->Data()->SetCookie(x34_regionFindCookie);
}
}
}
++x34_regionFindCookie;
return ret;
}