From 9960c411933f9a804eb5f6840d75ad00fd255252 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Tue, 5 May 2020 18:04:18 +0300 Subject: Remove Miami stuff --- src/entities/Entity.cpp | 8 -------- src/entities/Entity.h | 8 -------- src/entities/Physical.cpp | 2 -- src/entities/Treadable.h | 4 ---- 4 files changed, 22 deletions(-) (limited to 'src/entities') diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp index 955f32a8..7bacd421 100644 --- a/src/entities/Entity.cpp +++ b/src/entities/Entity.cpp @@ -52,9 +52,6 @@ CEntity::CEntity(void) bRenderScorched = false; bHasBlip = false; bIsBIGBuilding = false; -#ifdef MIAMI - bStreamBIGBuilding = false; -#endif bRenderDamaged = false; bBulletProof = false; @@ -348,11 +345,6 @@ 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"); diff --git a/src/entities/Entity.h b/src/entities/Entity.h index 49c6932c..17353f97 100644 --- a/src/entities/Entity.h +++ b/src/entities/Entity.h @@ -59,9 +59,6 @@ public: uint32 bRenderScorched : 1; uint32 bHasBlip : 1; uint32 bIsBIGBuilding : 1; // Set if this entity is a big building -#ifdef MIAMI - uint32 bStreamBIGBuilding : 1; // set when draw dist <= 2000 -#endif uint32 bRenderDamaged : 1; // use damaged LOD models for objects with applicable damage // flagsC @@ -93,12 +90,7 @@ 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: diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp index a61aaa78..dd49ea3e 100644 --- a/src/entities/Physical.cpp +++ b/src/entities/Physical.cpp @@ -267,7 +267,6 @@ void CPhysical::AddCollisionRecord_Treadable(CEntity *ent) { if(ent->IsBuilding() && ((CBuilding*)ent)->GetIsATreadable()){ -#ifndef MIAMI CTreadable *t = (CTreadable*)ent; if(t->m_nodeIndices[PATH_PED][0] >= 0 || t->m_nodeIndices[PATH_PED][1] >= 0 || @@ -279,7 +278,6 @@ CPhysical::AddCollisionRecord_Treadable(CEntity *ent) t->m_nodeIndices[PATH_CAR][2] >= 0 || t->m_nodeIndices[PATH_CAR][3] >= 0) m_treadable[PATH_CAR] = t; -#endif } } diff --git a/src/entities/Treadable.h b/src/entities/Treadable.h index 78f69c8a..9e4de59a 100644 --- a/src/entities/Treadable.h +++ b/src/entities/Treadable.h @@ -8,12 +8,8 @@ public: static void *operator new(size_t); static void operator delete(void*, size_t); -#ifndef MIAMI int16 m_nodeIndices[2][12]; // first car, then ped -#endif bool GetIsATreadable(void) { return true; } }; -#ifndef MIAMI static_assert(sizeof(CTreadable) == 0x94, "CTreadable: error"); -#endif -- cgit v1.2.3