summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-01-13 00:32:39 +0100
committerGitHub <noreply@github.com>2021-01-13 00:32:39 +0100
commit5d4917a5d76898a059b99f2c64ed67c297d3f280 (patch)
tree25ae755d979ff1aa4b8d1a8927a751f2468ca1f5
parentMerge pull request #955 from withmorten/miami (diff)
parentmore securom fixes (diff)
downloadre3-5d4917a5d76898a059b99f2c64ed67c297d3f280.tar
re3-5d4917a5d76898a059b99f2c64ed67c297d3f280.tar.gz
re3-5d4917a5d76898a059b99f2c64ed67c297d3f280.tar.bz2
re3-5d4917a5d76898a059b99f2c64ed67c297d3f280.tar.lz
re3-5d4917a5d76898a059b99f2c64ed67c297d3f280.tar.xz
re3-5d4917a5d76898a059b99f2c64ed67c297d3f280.tar.zst
re3-5d4917a5d76898a059b99f2c64ed67c297d3f280.zip
-rw-r--r--src/control/Replay.cpp18
-rw-r--r--src/vehicles/Cranes.h2
-rw-r--r--src/vehicles/Heli.cpp2
3 files changed, 11 insertions, 11 deletions
diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp
index db768e17..e7e0ea8c 100644
--- a/src/control/Replay.cpp
+++ b/src/control/Replay.cpp
@@ -1748,17 +1748,17 @@ void CReplay::PlayReplayFromHD(void)
return;
}
int slot;
- for (slot = 0; CFileMgr::Read(fr, (char*)CReplay::Buffers[slot], sizeof(CReplay::Buffers[slot])); slot++)
- CReplay::BufferStatus[slot] = CReplay::REPLAYBUFFER_PLAYBACK;
- CReplay::BufferStatus[slot - 1] = CReplay::REPLAYBUFFER_RECORD;
- while (slot < CReplay::NUM_REPLAYBUFFERS)
- CReplay::BufferStatus[slot++] = CReplay::REPLAYBUFFER_UNUSED;
+ for (slot = 0; CFileMgr::Read(fr, (char*)Buffers[slot], sizeof(Buffers[slot])); slot++)
+ BufferStatus[slot] = REPLAYBUFFER_PLAYBACK;
+ BufferStatus[slot - 1] = REPLAYBUFFER_RECORD;
+ while (slot < NUM_REPLAYBUFFERS)
+ BufferStatus[slot++] = REPLAYBUFFER_UNUSED;
CFileMgr::CloseFile(fr);
CFileMgr::SetDir("");
- CReplay::TriggerPlayback(CReplay::REPLAYCAMMODE_ASSTORED, 0.0f, 0.0f, 0.0f, false);
- CReplay::bPlayingBackFromFile = true;
- CReplay::bAllowLookAroundCam = true;
- CReplay::StreamAllNecessaryCarsAndPeds();
+ TriggerPlayback(REPLAYCAMMODE_ASSTORED, 0.0f, 0.0f, 0.0f, false);
+ bPlayingBackFromFile = true;
+ bAllowLookAroundCam = true;
+ StreamAllNecessaryCarsAndPeds();
}
void CReplay::StreamAllNecessaryCarsAndPeds(void)
diff --git a/src/vehicles/Cranes.h b/src/vehicles/Cranes.h
index 162f9af9..e842ed3f 100644
--- a/src/vehicles/Cranes.h
+++ b/src/vehicles/Cranes.h
@@ -88,7 +88,7 @@ public:
static bool IsThisCarBeingCarriedByAnyCrane(CVehicle* pVehicle);
static bool IsThisCarBeingTargettedByAnyCrane(CVehicle* pVehicle);
static void Save(uint8* buf, uint32* size);
- static void Load(uint8* buf, uint32 size); // on mobile it's CranesLoad outside of the class
+ static void Load(uint8* buf, uint32 size); // out of class in III PC and later because of SecuROM
static uint32 CarsCollectedMilitaryCrane;
static int32 NumCranes;
diff --git a/src/vehicles/Heli.cpp b/src/vehicles/Heli.cpp
index 7854f7fd..1c1b2617 100644
--- a/src/vehicles/Heli.cpp
+++ b/src/vehicles/Heli.cpp
@@ -800,7 +800,7 @@ CHeli::GenerateHeli(bool catalina)
id++;
found = true;
for(i = 0; i < 4; i++)
- if(CHeli::pHelis[i] && CHeli::pHelis[i]->m_nHeliId == id)
+ if(pHelis[i] && pHelis[i]->m_nHeliId == id)
found = false;
}
heli->m_nHeliId = id;