diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-06 19:28:40 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-06 19:28:40 +0100 |
| commit | 406f64694990ca84622205538a72e080499b4464 (patch) | |
| tree | e54e7a35d7ed03b49e52430286c317ae0e88983f /src/vehicles | |
| parent | quick fix (diff) | |
| download | re3-406f64694990ca84622205538a72e080499b4464.tar re3-406f64694990ca84622205538a72e080499b4464.tar.gz re3-406f64694990ca84622205538a72e080499b4464.tar.bz2 re3-406f64694990ca84622205538a72e080499b4464.tar.lz re3-406f64694990ca84622205538a72e080499b4464.tar.xz re3-406f64694990ca84622205538a72e080499b4464.tar.zst re3-406f64694990ca84622205538a72e080499b4464.zip | |
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Cranes.cpp | 6 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/vehicles/Cranes.cpp b/src/vehicles/Cranes.cpp index 2a571a67..8433a0ba 100644 --- a/src/vehicles/Cranes.cpp +++ b/src/vehicles/Cranes.cpp @@ -629,11 +629,11 @@ void CCranes::Save(uint8* buf, uint32* size) for (int i = 0; i < NUM_CRANES; i++) { CCrane *pCrane = WriteSaveBuf(buf, aCranes[i]); if (pCrane->m_pCraneEntity != nil) - pCrane->m_pCraneEntity = (CBuilding*)(CPools::GetBuildingPool()->GetJustIndex(pCrane->m_pCraneEntity) + 1); + pCrane->m_pCraneEntity = (CBuilding*)(CPools::GetBuildingPool()->GetJustIndex_NoFreeAssert(pCrane->m_pCraneEntity) + 1); if (pCrane->m_pHook != nil) - pCrane->m_pHook = (CObject*)(CPools::GetObjectPool()->GetJustIndex(pCrane->m_pHook) + 1); + pCrane->m_pHook = (CObject*)(CPools::GetObjectPool()->GetJustIndex_NoFreeAssert(pCrane->m_pHook) + 1); if (pCrane->m_pVehiclePickedUp != nil) - pCrane->m_pVehiclePickedUp = (CVehicle*)(CPools::GetVehiclePool()->GetJustIndex(pCrane->m_pVehiclePickedUp) + 1); + pCrane->m_pVehiclePickedUp = (CVehicle*)(CPools::GetVehiclePool()->GetJustIndex_NoFreeAssert(pCrane->m_pVehiclePickedUp) + 1); } VALIDATESAVEBUF(*size); diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index f083e0f6..56de3562 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -2492,7 +2492,7 @@ IsVehiclePointerValid(CVehicle* pVehicle) { if (!pVehicle) return false; - int index = CPools::GetVehiclePool()->GetJustIndex(pVehicle); + int index = CPools::GetVehiclePool()->GetJustIndex_NoFreeAssert(pVehicle); #ifdef FIX_BUGS if (index < 0 || index >= NUMVEHICLES) #else |