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