2 files changed, 37 insertions, 1 deletions

diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp
index 2a6211d6..8014a47a 100644
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -27,6 +27,7 @@
 #include "Zones.h"
 #include "Bones.h"
 #include "Debug.h"
+#include "Renderer.h"
 
 int gBuildings;
 
@@ -51,6 +52,9 @@ CEntity::CEntity(void)
 	bRenderScorched = false;
 	bHasBlip = false;
 	bIsBIGBuilding = false;
+#ifdef MIAMI
+	bStreamBIGBuilding = false;
+#endif
 	bRenderDamaged = false;
 
 	bBulletProof = false;
@@ -59,8 +63,10 @@ CEntity::CEntity(void)
 	bMeleeProof = false;
 	bOnlyDamagedByPlayer = false;
 	bStreamingDontDelete = false;
+#ifdef GTA_ZONECULL
 	bZoneCulled = false;
 	bZoneCulled2 = false;
+#endif
 
 	bRemoveFromWorld = false;
 	bHasHitWall = false;
@@ -147,6 +153,17 @@ 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)
 {
@@ -331,6 +348,11 @@ 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
 	if(m_level == LEVEL_NONE){
 		if(mi->GetTxdSlot() != CTxdStore::FindTxdSlot("generic")){
 			mi->SetTexDictionary("generic");
@@ -953,8 +975,10 @@ 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);
 
@@ -1006,8 +1030,10 @@ 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);
 
diff --git a/src/entities/Entity.h b/src/entities/Entity.h
index dbe2c08b..94022224 100644
--- a/src/entities/Entity.h
+++ b/src/entities/Entity.h
@@ -59,7 +59,9 @@ public:
 	uint32 bRenderScorched : 1;
 	uint32 bHasBlip : 1;
 	uint32 bIsBIGBuilding : 1;			// Set if this entity is a big building
-	// VC inserts one more flag here: if drawdist <= 2000
+#ifdef MIAMI
+	uint32 bStreamBIGBuilding : 1;	// set when draw dist <= 2000
+#endif
 	uint32 bRenderDamaged : 1;			// use damaged LOD models for objects with applicable damage
 
 	// flagsC
@@ -69,8 +71,10 @@ public:
 	uint32 bMeleeProof : 1;
 	uint32 bOnlyDamagedByPlayer : 1;
 	uint32 bStreamingDontDelete : 1;	// Dont let the streaming remove this 
+#ifdef GTA_ZONECULL
 	uint32 bZoneCulled : 1;
 	uint32 bZoneCulled2 : 1;    // only treadables+10m
+#endif
 
 	// flagsD
 	uint32 bRemoveFromWorld : 1;		// remove this entity next time it should be processed
@@ -89,7 +93,12 @@ public:
 	uint16 m_scanCode;
 	uint16 m_randomSeed;
 	int16 m_modelIndex;
+#ifndef MIAMI
 	uint16 m_level;	// int16
+#else
+	int8 m_level;
+	int8 m_area;
+#endif
 	CReference *m_pFirstReference;
 
 public:
@@ -147,6 +156,7 @@ public:
 	bool GetIsTouching(CVector const &center, float r);
 	bool GetIsOnScreen(void);
 	bool GetIsOnScreenComplex(void);
+	bool GetIsOnScreenAndNotCulled(void);
 	bool IsVisible(void) { return m_rwObject && bIsVisible && GetIsOnScreen(); }
 	bool IsVisibleComplex(void) { return m_rwObject && bIsVisible && GetIsOnScreenComplex(); }
 	int GetModelIndex(void) { return m_modelIndex; }