diff options
| author | aap <aap@papnet.eu> | 2020-12-09 09:55:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 09:55:50 +0100 |
| commit | ccbbde549e81a7d0e71228ad5c244da6c8bd287f (patch) | |
| tree | b05d46740914289c3e713579716ef7cfa0068244 /src/entities | |
| parent | Vehicle cam object collision fix (diff) | |
| parent | sync with upstream (diff) | |
| download | re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.gz re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.bz2 re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.lz re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.xz re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.tar.zst re3-ccbbde549e81a7d0e71228ad5c244da6c8bd287f.zip | |
Diffstat (limited to 'src/entities')
| -rw-r--r-- | src/entities/Building.cpp | 4 | ||||
| -rw-r--r-- | src/entities/Dummy.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/entities/Building.cpp b/src/entities/Building.cpp index 921055ce..8035cf25 100644 --- a/src/entities/Building.cpp +++ b/src/entities/Building.cpp @@ -27,14 +27,14 @@ IsBuildingPointerValid(CBuilding* pBuilding) if (!pBuilding) return false; if (pBuilding->GetIsATreadable()) { - int index = CPools::GetTreadablePool()->GetJustIndex((CTreadable*)pBuilding); + int index = CPools::GetTreadablePool()->GetJustIndex_NoFreeAssert((CTreadable*)pBuilding); #ifdef FIX_BUGS return index >= 0 && index < CPools::GetTreadablePool()->GetSize(); #else return index >= 0 && index <= CPools::GetTreadablePool()->GetSize(); #endif } else { - int index = CPools::GetBuildingPool()->GetJustIndex(pBuilding); + int index = CPools::GetBuildingPool()->GetJustIndex_NoFreeAssert(pBuilding); #ifdef FIX_BUGS return index >= 0 && index < CPools::GetBuildingPool()->GetSize(); #else diff --git a/src/entities/Dummy.cpp b/src/entities/Dummy.cpp index 544e24a6..580245a8 100644 --- a/src/entities/Dummy.cpp +++ b/src/entities/Dummy.cpp @@ -58,7 +58,7 @@ IsDummyPointerValid(CDummy* pDummy) { if (!pDummy) return false; - int index = CPools::GetDummyPool()->GetJustIndex(pDummy); + int index = CPools::GetDummyPool()->GetJustIndex_NoFreeAssert(pDummy); #ifdef FIX_BUGS if (index < 0 || index >= CPools::GetDummyPool()->GetSize()) #else |