summaryrefslogtreecommitdiffstats
path: root/src/control/Pickups.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/control/Pickups.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/control/Pickups.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index a1e2a851..10175fba 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -23,6 +23,7 @@
#ifdef FIX_BUGS
#include "Replay.h"
#endif
+#include "SaveBuf.h"
#include "Script.h"
#include "Shadows.h"
#include "SpecialFX.h"
@@ -999,18 +1000,18 @@ CPickups::Load(uint8 *buf, uint32 size)
INITSAVEBUF
for (int32 i = 0; i < NUMPICKUPS; i++) {
- aPickUps[i] = ReadSaveBuf<CPickup>(buf);
+ ReadSaveBuf(&aPickUps[i], buf);
if (aPickUps[i].m_eType != PICKUP_NONE && aPickUps[i].m_pObject != nil)
aPickUps[i].m_pObject = CPools::GetObjectPool()->GetSlot((uintptr)aPickUps[i].m_pObject - 1);
}
- CollectedPickUpIndex = ReadSaveBuf<uint16>(buf);
- ReadSaveBuf<uint16>(buf);
+ ReadSaveBuf(&CollectedPickUpIndex, buf);
+ SkipSaveBuf(buf, 2);
NumMessages = 0;
for (uint16 i = 0; i < NUMCOLLECTEDPICKUPS; i++)
- aPickUpsCollected[i] = ReadSaveBuf<int32>(buf);
+ ReadSaveBuf(&aPickUpsCollected[i], buf);
VALIDATESAVEBUF(size)
}