summaryrefslogtreecommitdiff
path: root/src/entities
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-06-28 03:59:07 +0300
committerSergeanur <s.anureev@yandex.ua>2021-06-28 05:12:54 +0300
commitf8297df9c5a7d65d5658d1a8d85d391fbb15b95a (patch)
tree9dcfac13fc3be99320ca7b546c4ff2007bff4121 /src/entities
parent3587cb029e179fe08e572811e467227193e423d5 (diff)
Redo ReadSaveBuf + common.h cleanup
Diffstat (limited to 'src/entities')
-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 1545ce95..8d51cae7 100644
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -26,6 +26,7 @@
#include "Ped.h"
#include "Dummy.h"
#include "WindModifiers.h"
+#include "SaveBuf.h"
int gBuildings;
@@ -850,7 +851,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));
@@ -881,7 +883,7 @@ CEntity::LoadEntityFlags(uint8*& buf)
bStreamingDontDelete = !!(tmp & BIT(30));
bRemoveFromWorld = !!(tmp & BIT(31));
- tmp = ReadSaveBuf<uint32>(buf);
+ ReadSaveBuf(&tmp, buf);
bHasHitWall = !!(tmp & BIT(0));
bImBeingRendered = !!(tmp & BIT(1));