From e81652c2fc2787fc8aab3937be62127e7a3354ee Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Tue, 5 May 2020 18:06:38 +0200
Subject: cleaned up MIAMI ifdefs

---
 src/entities/Entity.cpp | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

(limited to 'src/entities/Entity.cpp')

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);
 
-- 
cgit v1.2.3