diff options
author | aap <aap@papnet.eu> | 2019-07-09 09:57:44 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2019-07-09 09:57:44 +0200 |
commit | 74fcbc8c0a6bbac8e8057655c5f1133e15c63656 (patch) | |
tree | 75dabaa5dc285f1541c6ee058028c7f57095eecf /src/control | |
parent | Merge branch 'master' of github.com:GTAmodding/re3 (diff) | |
download | re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.gz re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.bz2 re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.lz re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.xz re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.zst re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.zip |
Diffstat (limited to 'src/control')
-rw-r--r-- | src/control/AutoPilot.h | 6 | ||||
-rw-r--r-- | src/control/Replay.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/control/AutoPilot.h b/src/control/AutoPilot.h index 97b02f5c..351fd117 100644 --- a/src/control/AutoPilot.h +++ b/src/control/AutoPilot.h @@ -59,9 +59,9 @@ enum eCarDrivingStyle : uint8 class CAutoPilot { public: - void *m_currentAddress; - void *m_startingRouteNode; - void *m_PreviousRouteNode; + uint32 m_currentAddress; + uint32 m_startingRouteNode; + uint32 m_PreviousRouteNode; uint32 m_nTotalSpeedScaleFactor; uint32 m_nSpeedScaleFactor; uint32 m_nCurrentPathNodeInfo; diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp index 56e37dae..2bdb9dfe 100644 --- a/src/control/Replay.cpp +++ b/src/control/Replay.cpp @@ -290,14 +290,14 @@ void CReplay::RecordThisFrame(void) CPed* p = peds->GetSlot(i); if (!p || !p->m_rwObject) continue; - if (!p->bRecordedForReplay){ + if (!p->bHasAlreadyBeenRecorded){ tPedHeaderPacket* ph = (tPedHeaderPacket*)&Record.m_pBase[Record.m_nOffset]; ph->type = REPLAYPACKET_PED_HEADER; ph->index = i; ph->mi = p->GetModelIndex(); ph->pedtype = p->m_nPedType; Record.m_nOffset += sizeof(*ph); - p->bRecordedForReplay = true; + p->bHasAlreadyBeenRecorded = true; } StorePedUpdate(p, i); } @@ -1346,14 +1346,14 @@ void CReplay::MarkEverythingAsNew(void) CVehicle* v = CPools::GetVehiclePool()->GetSlot(i); if (!v) continue; - v->bRecordedForReplay = false; + v->bHasAlreadyBeenRecorded = false; } i = CPools::GetPedPool()->GetSize(); while (i--) { CPed* p = CPools::GetPedPool()->GetSlot(i); if (!p) continue; - p->bRecordedForReplay = false; + p->bHasAlreadyBeenRecorded = false; } } #endif |