github.com/td512.re3
1
0
Fork 0
mirror of https://github.com/td512/re3.git synced 2026-03-01 10:10:51 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Revert "Redo ReadSaveBuf + common.h cleanup""

Browse Source 
This reverts commit af7573ddbe.
This commit is contained in:
withmorten
2021-06-26 19:14:46 +02:00
parent 090fa619b4
commit f3a931e1c9
26 changed files with 398 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/Pools.cpp
View File

@@ -9,6 +9,7 @@
#endif
#include "Population.h"
#include "ProjectileInfo.h"
#include "SaveBuf.h"
#include "Streaming.h"
#include "Wanted.h"
#include "World.h"
@@ -130,14 +131,19 @@ CPools::MakeSureSlotInObjectPoolIsEmpty(int32 slot)
void CPools::LoadVehiclePool(uint8* buf, uint32 size)
{
INITSAVEBUF
int nNumCars = ReadSaveBuf<int>(buf);
int nNumBoats = ReadSaveBuf<int>(buf);
int nNumCars, nNumBoats;
ReadSaveBuf(&nNumCars, buf);
ReadSaveBuf(&nNumBoats, buf);
for (int i = 0; i < nNumCars + nNumBoats; i++) {
uint32 type = ReadSaveBuf<uint32>(buf);
int16 model = ReadSaveBuf<int16>(buf);
uint32 type;
int16 model;
int32 slot;
ReadSaveBuf(&type, buf);
ReadSaveBuf(&model, buf);
CStreaming::RequestModel(model, STREAMFLAGS_DEPENDENCY);
CStreaming::LoadAllRequestedModels(false);
int32 slot = ReadSaveBuf<int32>(buf);
ReadSaveBuf(&slot, buf);
CVehicle* pVehicle;
#ifdef COMPATIBLE_SAVES
if (type == VEHICLE_TYPE_BOAT)