diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-06-28 02:59:07 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-06-28 04:12:54 +0200 |
| commit | f8297df9c5a7d65d5658d1a8d85d391fbb15b95a (patch) | |
| tree | 9dcfac13fc3be99320ca7b546c4ff2007bff4121 /src/core/Radar.cpp | |
| parent | Remove waiting for stream closure in multi-thread audio (diff) | |
| download | re3-f8297df9c5a7d65d5658d1a8d85d391fbb15b95a.tar re3-f8297df9c5a7d65d5658d1a8d85d391fbb15b95a.tar.gz re3-f8297df9c5a7d65d5658d1a8d85d391fbb15b95a.tar.bz2 re3-f8297df9c5a7d65d5658d1a8d85d391fbb15b95a.tar.lz re3-f8297df9c5a7d65d5658d1a8d85d391fbb15b95a.tar.xz re3-f8297df9c5a7d65d5658d1a8d85d391fbb15b95a.tar.zst re3-f8297df9c5a7d65d5658d1a8d85d391fbb15b95a.zip | |
Diffstat (limited to 'src/core/Radar.cpp')
| -rw-r--r-- | src/core/Radar.cpp | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp index fadca215..f58f4687 100644 --- a/src/core/Radar.cpp +++ b/src/core/Radar.cpp @@ -19,6 +19,7 @@ #include "Streaming.h" #include "SpecialFX.h" #include "Font.h" +#include "SaveBuf.h" float CRadar::m_radarRange; sRadarTrace CRadar::ms_RadarTrace[NUMRADARBLIPS]; @@ -973,21 +974,21 @@ INITSAVEBUF CheckSaveHeader(buf, 'R', 'D', 'R', '\0', size - SAVE_HEADER_SIZE); for (int i = 0; i < NUMRADARBLIPS; i++) { - ms_RadarTrace[i].m_nColor = ReadSaveBuf<uint32>(buf); - ms_RadarTrace[i].m_Radius = ReadSaveBuf<float>(buf); - ms_RadarTrace[i].m_eBlipType = ReadSaveBuf<uint32>(buf); - ms_RadarTrace[i].m_nEntityHandle = ReadSaveBuf<int32>(buf); - ms_RadarTrace[i].m_vec2DPos.x = ReadSaveBuf<float>(buf); // CVector2D - ms_RadarTrace[i].m_vec2DPos.y = ReadSaveBuf<float>(buf); - ms_RadarTrace[i].m_vecPos = ReadSaveBuf<CVector>(buf); - ms_RadarTrace[i].m_BlipIndex = ReadSaveBuf<uint16>(buf); - ms_RadarTrace[i].m_bDim = ReadSaveBuf<bool>(buf); - ms_RadarTrace[i].m_bInUse = ReadSaveBuf<bool>(buf); - ms_RadarTrace[i].m_bShortRange = ReadSaveBuf<bool>(buf); - ms_RadarTrace[i].m_unused = ReadSaveBuf<bool>(buf); - ms_RadarTrace[i].m_wScale = ReadSaveBuf<int16>(buf); - ms_RadarTrace[i].m_eBlipDisplay = ReadSaveBuf<uint16>(buf); - ms_RadarTrace[i].m_eRadarSprite = ReadSaveBuf<uint16>(buf); + ReadSaveBuf(&ms_RadarTrace[i].m_nColor, buf); + ReadSaveBuf(&ms_RadarTrace[i].m_Radius, buf); + ReadSaveBuf(&ms_RadarTrace[i].m_eBlipType, buf); + ReadSaveBuf(&ms_RadarTrace[i].m_nEntityHandle, buf); + ReadSaveBuf(&ms_RadarTrace[i].m_vec2DPos.x, buf); + ReadSaveBuf(&ms_RadarTrace[i].m_vec2DPos.y, buf); + ReadSaveBuf(&ms_RadarTrace[i].m_vecPos, buf); + ReadSaveBuf(&ms_RadarTrace[i].m_BlipIndex, buf); + ReadSaveBuf(&ms_RadarTrace[i].m_bDim, buf); + ReadSaveBuf(&ms_RadarTrace[i].m_bInUse, buf); + ReadSaveBuf(&ms_RadarTrace[i].m_bShortRange, buf); + ReadSaveBuf(&ms_RadarTrace[i].m_unused, buf); + ReadSaveBuf(&ms_RadarTrace[i].m_wScale, buf); + ReadSaveBuf(&ms_RadarTrace[i].m_eBlipDisplay, buf); + ReadSaveBuf(&ms_RadarTrace[i].m_eRadarSprite, buf); } VALIDATESAVEBUF(size); |