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/control/Phones.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 '')
-rw-r--r-- | src/control/Phones.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/control/Phones.cpp b/src/control/Phones.cpp index 9b50a7ec..a962052f 100644 --- a/src/control/Phones.cpp +++ b/src/control/Phones.cpp @@ -13,6 +13,7 @@ #include "RpAnimBlend.h" #include "AnimBlendAssociation.h" #include "soundlist.h" +#include "SaveBuf.h" #ifdef FIX_BUGS #include "Replay.h" #endif @@ -197,10 +198,10 @@ void CPhoneInfo::Load(uint8 *buf, uint32 size) { INITSAVEBUF - m_nMax = ReadSaveBuf<int32>(buf); - m_nScriptPhonesMax = ReadSaveBuf<int32>(buf); + ReadSaveBuf(&m_nMax, buf); + ReadSaveBuf(&m_nScriptPhonesMax, buf); for (int i = 0; i < NUMPHONES; i++) { - m_aPhones[i] = ReadSaveBuf<CPhone>(buf); + ReadSaveBuf(&m_aPhones[i], buf); // It's saved as building pool index in save file, convert it to true entity if (m_aPhones[i].m_pEntity) { m_aPhones[i].m_pEntity = CPools::GetBuildingPool()->GetSlot((uintptr)m_aPhones[i].m_pEntity - 1); |