diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-30 21:41:20 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-30 21:41:20 +0300 |
| commit | dc12718fc20b2e70fa27653b19dd57f7d141d606 (patch) | |
| tree | 80667ad887360af7a6ed8d9500e2952d57c61bc0 /src/core/Pools.cpp | |
| parent | b1a093c6ff44aa1de34fd961b7dfd7fb960390ab (diff) | |
| parent | e14733367e9847ee7eb0ce52b0fcb501ea13a3c6 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/core/Pools.cpp')
| -rw-r--r-- | src/core/Pools.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp index 8c979f6e..011c7af7 100644 --- a/src/core/Pools.cpp +++ b/src/core/Pools.cpp @@ -88,7 +88,7 @@ CPools::MakeSureSlotInObjectPoolIsEmpty(int32 slot) delete object; } else if (!CProjectileInfo::RemoveIfThisIsAProjectile(object)) { // relocate to another slot?? - CObject *newObject = new CObject(); + CObject *newObject = new CObject(object->GetModelIndex(), false); CWorld::Remove(object); memcpy(newObject, object, ms_pObjectPool->GetMaxEntrySize()); CWorld::Add(newObject); @@ -179,8 +179,8 @@ INITSAVEBUF pVehicle->m_nTimeOfDeath = pBufferVehicle->m_nTimeOfDeath; #endif pVehicle->m_nDoorLock = pBufferVehicle->m_nDoorLock; - pVehicle->m_status = pBufferVehicle->m_status; - pVehicle->m_type = pBufferVehicle->m_type; + pVehicle->SetStatus(pBufferVehicle->GetStatus()); + pVehicle->SetType(pBufferVehicle->GetType()); (pVehicle->GetAddressOfEntityProperties())[0] = (pBufferVehicle->GetAddressOfEntityProperties())[0]; (pVehicle->GetAddressOfEntityProperties())[1] = (pBufferVehicle->GetAddressOfEntityProperties())[1]; pVehicle->AutoPilot = pBufferVehicle->AutoPilot; |