summaryrefslogtreecommitdiffstats
path: root/src/entities/Entity.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-05 19:22:17 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-05 19:22:17 +0200
commitf45ea0a1cf5ab2c46e53d3e352cb3a5b0ded1b80 (patch)
treedc15134e54afea71e397a16ab828a0a73edc0ea9 /src/entities/Entity.cpp
parentsome more miami (diff)
parentsome miami limits (diff)
downloadre3-f45ea0a1cf5ab2c46e53d3e352cb3a5b0ded1b80.tar
re3-f45ea0a1cf5ab2c46e53d3e352cb3a5b0ded1b80.tar.gz
re3-f45ea0a1cf5ab2c46e53d3e352cb3a5b0ded1b80.tar.bz2
re3-f45ea0a1cf5ab2c46e53d3e352cb3a5b0ded1b80.tar.lz
re3-f45ea0a1cf5ab2c46e53d3e352cb3a5b0ded1b80.tar.xz
re3-f45ea0a1cf5ab2c46e53d3e352cb3a5b0ded1b80.tar.zst
re3-f45ea0a1cf5ab2c46e53d3e352cb3a5b0ded1b80.zip
Diffstat (limited to 'src/entities/Entity.cpp')
-rw-r--r--src/entities/Entity.cpp29
1 files changed, 1 insertions, 28 deletions
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp
index 955f32a8..453ee806 100644
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -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);