archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-25 15:22:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Redo ReadSaveBuf + common.h cleanup"

Browse Source 
This reverts commit 2b67aba94c.
This commit is contained in:
erorcun
2021-06-26 00:25:59 +03:00
parent 4bab6d5356
commit af7573ddbe
26 changed files with 337 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/entities/Entity.cpp
View File

@ -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));