summaryrefslogtreecommitdiffstats
path: root/src/core/Pools.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-06-25 18:03:05 +0200
committerSergeanur <s.anureev@yandex.ua>2021-06-25 18:03:51 +0200
commit2b67aba94cb6448fb24c869559465eddf2bad069 (patch)
tree5c68ff4f8ce3153640a7b864495e167bec04cce8 /src/core/Pools.cpp
parentUpdate invite link (diff)
downloadre3-2b67aba94cb6448fb24c869559465eddf2bad069.tar
re3-2b67aba94cb6448fb24c869559465eddf2bad069.tar.gz
re3-2b67aba94cb6448fb24c869559465eddf2bad069.tar.bz2
re3-2b67aba94cb6448fb24c869559465eddf2bad069.tar.lz
re3-2b67aba94cb6448fb24c869559465eddf2bad069.tar.xz
re3-2b67aba94cb6448fb24c869559465eddf2bad069.tar.zst
re3-2b67aba94cb6448fb24c869559465eddf2bad069.zip
Diffstat (limited to '')
-rw-r--r--src/core/Pools.cpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp
index 39cfb1d4..5cffe9e4 100644
--- a/src/core/Pools.cpp
+++ b/src/core/Pools.cpp
@@ -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)