diff options
| author | withmorten <morten.with@gmail.com> | 2021-06-26 19:14:46 +0200 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-06-26 19:14:46 +0200 |
| commit | f3a931e1c99372ae4bc224ef482d4052a09580cb (patch) | |
| tree | 13992380234e68b8f1a32030b4df6aa3d6ebbaca /src/entities/Entity.cpp | |
| parent | 090fa619b472301f5a6be1a1ab54c09870b210ce (diff) | |
Revert "Revert "Redo ReadSaveBuf + common.h cleanup""
This reverts commit af7573ddbe38e0aaa485877e7ccb2e704b0f5a7f.
Diffstat (limited to 'src/entities/Entity.cpp')
| -rw-r--r-- | src/entities/Entity.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp index 9d5bf73c..a7f4bd45 100644 --- a/src/entities/Entity.cpp +++ b/src/entities/Entity.cpp @@ -22,6 +22,7 @@ #include "MemoryHeap.h" #include "Bones.h" #include "Debug.h" +#include "SaveBuf.h" int gBuildings; @@ -753,7 +754,8 @@ CEntity::SaveEntityFlags(uint8*& buf) void CEntity::LoadEntityFlags(uint8*& buf) { - uint32 tmp = ReadSaveBuf<uint32>(buf); + uint32 tmp; + ReadSaveBuf(&tmp, buf); m_type = (tmp & ((BIT(3) - 1))); m_status = ((tmp >> 3) & (BIT(5) - 1)); @@ -784,7 +786,7 @@ CEntity::LoadEntityFlags(uint8*& buf) bZoneCulled = !!(tmp & BIT(30)); bZoneCulled2 = !!(tmp & BIT(31)); - tmp = ReadSaveBuf<uint32>(buf); + ReadSaveBuf(&tmp, buf); bRemoveFromWorld = !!(tmp & BIT(0)); bHasHitWall = !!(tmp & BIT(1)); |