diff options
| author | withmorten <morten.with@gmail.com> | 2021-01-21 03:20:31 +0100 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-01-21 03:20:31 +0100 |
| commit | f2596b3759e11098e27f440b129293adab1f4c07 (patch) | |
| tree | 9157c19ae9a5c7c7fbfd3ec43ce6663297d050a1 /src/control | |
| parent | make building with Codewarrior 7 possible (diff) | |
| parent | fixed saving (diff) | |
| download | re3-f2596b3759e11098e27f440b129293adab1f4c07.tar re3-f2596b3759e11098e27f440b129293adab1f4c07.tar.gz re3-f2596b3759e11098e27f440b129293adab1f4c07.tar.bz2 re3-f2596b3759e11098e27f440b129293adab1f4c07.tar.lz re3-f2596b3759e11098e27f440b129293adab1f4c07.tar.xz re3-f2596b3759e11098e27f440b129293adab1f4c07.tar.zst re3-f2596b3759e11098e27f440b129293adab1f4c07.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Garages.cpp | 8 | ||||
| -rw-r--r-- | src/control/Replay.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp index 2b79b338..79c44dfd 100644 --- a/src/control/Garages.cpp +++ b/src/control/Garages.cpp @@ -1539,7 +1539,7 @@ void CGarage::RefreshDoorPointers(bool bCreate) m_bRecreateDoorOnNextRefresh = false; if (m_pDoor1) { if (m_bDoor1IsDummy) { - if (CPools::GetDummyPool()->IsFreeSlot(CPools::GetDummyPool()->GetJustIndex_NoFreeAssert((CDummy*)m_pDoor1))) + if (CPools::GetDummyPool()->GetIsFree(CPools::GetDummyPool()->GetJustIndex_NoFreeAssert((CDummy*)m_pDoor1))) bNeedToFindDoorEntities = true; else { if (m_bDoor1PoolIndex != (CPools::GetDummyPool()->GetIndex((CDummy*)m_pDoor1) & 0x7F)) @@ -1549,7 +1549,7 @@ void CGarage::RefreshDoorPointers(bool bCreate) } } else { - if (CPools::GetObjectPool()->IsFreeSlot(CPools::GetObjectPool()->GetJustIndex_NoFreeAssert((CObject*)m_pDoor1))) + if (CPools::GetObjectPool()->GetIsFree(CPools::GetObjectPool()->GetJustIndex_NoFreeAssert((CObject*)m_pDoor1))) bNeedToFindDoorEntities = true; else { if (m_bDoor1PoolIndex != (CPools::GetObjectPool()->GetIndex((CObject*)m_pDoor1) & 0x7F)) @@ -1561,7 +1561,7 @@ void CGarage::RefreshDoorPointers(bool bCreate) } if (m_pDoor2) { if (m_bDoor2IsDummy) { - if (CPools::GetDummyPool()->IsFreeSlot(CPools::GetDummyPool()->GetJustIndex_NoFreeAssert((CDummy*)m_pDoor2))) + if (CPools::GetDummyPool()->GetIsFree(CPools::GetDummyPool()->GetJustIndex_NoFreeAssert((CDummy*)m_pDoor2))) bNeedToFindDoorEntities = true; else { if (m_bDoor2PoolIndex != (CPools::GetDummyPool()->GetIndex((CDummy*)m_pDoor2) & 0x7F)) @@ -1571,7 +1571,7 @@ void CGarage::RefreshDoorPointers(bool bCreate) } } else { - if (CPools::GetObjectPool()->IsFreeSlot(CPools::GetObjectPool()->GetJustIndex_NoFreeAssert((CObject*)m_pDoor2))) + if (CPools::GetObjectPool()->GetIsFree(CPools::GetObjectPool()->GetJustIndex_NoFreeAssert((CObject*)m_pDoor2))) bNeedToFindDoorEntities = true; else { if (m_bDoor2PoolIndex != (CPools::GetObjectPool()->GetIndex((CObject*)m_pDoor2) & 0x7F)) diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp index 2e87d1a7..2dd66333 100644 --- a/src/control/Replay.cpp +++ b/src/control/Replay.cpp @@ -305,7 +305,7 @@ void CReplay::RecordThisFrame(void) #endif tGeneralPacket* general = (tGeneralPacket*)&Record.m_pBase[Record.m_nOffset]; general->type = REPLAYPACKET_GENERAL; - general->camera_pos.CopyOnlyMatrix(&TheCamera.GetMatrix()); + general->camera_pos.CopyOnlyMatrix(TheCamera.GetMatrix()); general->player_pos = FindPlayerCoors(); general->in_rcvehicle = CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle ? true : false; Record.m_nOffset += sizeof(*general); |