diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-06-28 03:59:07 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-06-28 05:12:54 +0300 |
| commit | f8297df9c5a7d65d5658d1a8d85d391fbb15b95a (patch) | |
| tree | 9dcfac13fc3be99320ca7b546c4ff2007bff4121 /src/control/Pickups.cpp | |
| parent | 3587cb029e179fe08e572811e467227193e423d5 (diff) | |
Redo ReadSaveBuf + common.h cleanup
Diffstat (limited to 'src/control/Pickups.cpp')
| -rw-r--r-- | src/control/Pickups.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp index 0428ddae..fd7bfe0e 100644 --- a/src/control/Pickups.cpp +++ b/src/control/Pickups.cpp @@ -33,6 +33,7 @@ #include "Hud.h" #include "Messages.h" #include "Streaming.h" +#include "SaveBuf.h" CPickup CPickups::aPickUps[NUMPICKUPS]; int16 CPickups::NumMessages; @@ -1441,7 +1442,7 @@ 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) { if (aPickUps[i].m_pObject != nil) @@ -1452,12 +1453,12 @@ INITSAVEBUF } - 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) } |