summaryrefslogtreecommitdiff
path: root/src/entities/Entity.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-06-25 19:03:05 +0300
committerSergeanur <s.anureev@yandex.ua>2021-06-25 19:03:51 +0300
commit2b67aba94cb6448fb24c869559465eddf2bad069 (patch)
tree5c68ff4f8ce3153640a7b864495e167bec04cce8 /src/entities/Entity.cpp
parent6152f02333e296bd87fbc12f4fe59ca42e7e293e (diff)
Redo ReadSaveBuf + common.h cleanup
Diffstat (limited to 'src/entities/Entity.cpp')
-rw-r--r--src/entities/Entity.cpp6
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));