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

cleaned up MIAMI ifdefs

Browse source
This commit is contained in:
aap 2020-05-05 18:06:38 +02:00
parent 2c0b82ec1a
commit e81652c2fc
46 changed files with 95 additions and 2006 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/entities/Entity.cpp
View file

@ -52,9 +52,7 @@ CEntity::CEntity(void)
bRenderScorched = false;
bHasBlip = false;
bIsBIGBuilding = false;
#ifdef MIAMI
bStreamBIGBuilding = false;
#endif
bRenderDamaged = false;
bBulletProof = false;
@ -63,10 +61,6 @@ CEntity::CEntity(void)
bMeleeProof = false;
bOnlyDamagedByPlayer = false;
bStreamingDontDelete = false;
#ifdef GTA_ZONECULL
bZoneCulled = false;
bZoneCulled2 = false;
#endif
bRemoveFromWorld = false;
bHasHitWall = false;
@ -153,17 +147,6 @@ CEntity::GetIsOnScreenComplex(void)
return TheCamera.IsBoxVisible(boundBox, &TheCamera.GetCameraMatrix());
}
bool
CEntity::GetIsOnScreenAndNotCulled(void)
{
#ifdef GTA_ZONECULL
return GetIsOnScreen() && CRenderer::IsEntityCullZoneVisible(this);
#else
return GetIsOnScreen();
#endif
}
void
CEntity::Add(void)
{
@ -348,11 +331,9 @@ CEntity::SetupBigBuilding(void)
bStreamingDontDelete = true;
bUsesCollision = false;
m_level = CTheZones::GetLevelFromPosition(GetPosition());
#ifdef MIAMI
if(mi->m_lodDistances[0] <= 2000.0f)
bStreamBIGBuilding = true;
// TODO: the stuff down there isn't right yet
#endif
// TODO(MIAMI): the stuff down there isn't right yet
if(m_level == LEVEL_NONE){
if(mi->GetTxdSlot() != CTxdStore::FindTxdSlot("generic")){
mi->SetTexDictionary("generic");
@ -975,10 +956,6 @@ CEntity::SaveEntityFlags(uint8*& buf)
if (bMeleeProof) tmp |= BIT(27);
if (bOnlyDamagedByPlayer) tmp |= BIT(28);
if (bStreamingDontDelete) tmp |= BIT(29);
#ifdef GTA_ZONECULL
if (bZoneCulled) tmp |= BIT(30);
if (bZoneCulled2) tmp |= BIT(31);
#endif
WriteSaveBuf<uint32>(buf, tmp);
@ -1030,10 +1007,6 @@ CEntity::LoadEntityFlags(uint8*& buf)
bMeleeProof = !!(tmp & BIT(27));
bOnlyDamagedByPlayer = !!(tmp & BIT(28));
bStreamingDontDelete = !!(tmp & BIT(29));
#ifdef GTA_ZONECULL
bZoneCulled = !!(tmp & BIT(30));
bZoneCulled2 = !!(tmp & BIT(31));
#endif
tmp = ReadSaveBuf<uint32>(buf);