diff options
| author | erorcun <erorcunerorcun@hotmail.com.tr> | 2020-12-09 04:34:04 +0100 |
|---|---|---|
| committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2020-12-09 04:34:04 +0100 |
| commit | ba0c9e8b295cc988077df68a71573d3ebcff2b60 (patch) | |
| tree | 0532f46e3335ca84ff32caa4884a145ba06e0e10 /src/control/Pickups.cpp | |
| parent | Frontend cleanup, .INI, CFO, scrollable pages (diff) | |
| parent | Merge pull request #872 from withmorten/sized-enums-miami (diff) | |
| download | re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.tar re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.tar.gz re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.tar.bz2 re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.tar.lz re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.tar.xz re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.tar.zst re3-ba0c9e8b295cc988077df68a71573d3ebcff2b60.zip | |
Diffstat (limited to 'src/control/Pickups.cpp')
| -rw-r--r-- | src/control/Pickups.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp index 1ff4f8f6..8408356d 100644 --- a/src/control/Pickups.cpp +++ b/src/control/Pickups.cpp @@ -852,7 +852,7 @@ CPickups::GenerateNewOne(CVector pos, uint32 modelIndex, uint8 type, uint32 quan if (slot >= NUMPICKUPS) return -1; - aPickUps[slot].m_eType = (ePickupType)type; + aPickUps[slot].m_eType = type; aPickUps[slot].m_bRemoved = false; aPickUps[slot].m_nQuantity = quantity; aPickUps[slot].m_nMoneySpeed = rate; @@ -1458,9 +1458,9 @@ INITSAVEBUF CPickup *buf_pickup = WriteSaveBuf(buf, aPickUps[i]); if (buf_pickup->m_eType != PICKUP_NONE) { if (buf_pickup->m_pObject != nil) - buf_pickup->m_pObject = (CObject*)(CPools::GetObjectPool()->GetJustIndex(buf_pickup->m_pObject) + 1); + buf_pickup->m_pObject = (CObject*)(CPools::GetObjectPool()->GetJustIndex_NoFreeAssert(buf_pickup->m_pObject) + 1); if (buf_pickup->m_pExtraObject != nil) - buf_pickup->m_pExtraObject = (CObject*)(CPools::GetObjectPool()->GetJustIndex(buf_pickup->m_pExtraObject) + 1); + buf_pickup->m_pExtraObject = (CObject*)(CPools::GetObjectPool()->GetJustIndex_NoFreeAssert(buf_pickup->m_pExtraObject) + 1); } } |