mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-10-13 10:50:34 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Revert "Redo ReadSaveBuf + common.h cleanup""

Browse source 
This reverts commit af7573ddbe.
This commit is contained in:
withmorten 2021-06-26 19:14:46 +02:00
commit f3a931e1c9
26 changed files with 398 additions and 337 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/entities/Entity.cpp
View file

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