a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 03:40:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #956 from withmorten/miami

Browse source 
more securom fixes
This commit is contained in:
withmorten 2021-01-13 00:32:39 +01:00 committed by GitHub
parent 2b91af4493 e122a75dd2
commit 5d4917a5d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/control/Replay.cpp
View file

@ -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)

2
src/vehicles/Cranes.h
View file

@ -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;

2
src/vehicles/Heli.cpp
View file

@ -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;