mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-07-04 19:44:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'miami' into lcs

Browse source 
# Conflicts:
#	src/control/Script5.cpp
#	src/entities/Entity.cpp
This commit is contained in:
Sergeanur 2021-06-28 05:16:21 +03:00
commit eaebaa6db3
31 changed files with 460 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/entities/Entity.cpp
View file

@ -26,6 +26,7 @@
#include "Ped.h"
#include "Dummy.h"
#include "WindModifiers.h"
#include "SaveBuf.h"
#include "SpecialFX.h"
#include "VisibilityPlugins.h"
#include "RpAnimBlend.h"
@ -927,7 +928,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));
@ -958,7 +960,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));