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/core/Game.cpp | 21 ---------------------
 1 file changed, 21 deletions(-)

(limited to 'src/core/Game.cpp')

diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index d0b3f5a3..ea3301a1 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -89,9 +89,7 @@
 
 
 eLevelName CGame::currLevel;
-#ifdef MIAMI
 int32 CGame::currArea;
-#endif
 bool CGame::bDemoMode = true;
 bool CGame::nastyGame = true;
 bool CGame::frenchGame;
@@ -322,9 +320,6 @@ bool CGame::Initialise(const char* datFile)
 	CDraw::SetFOV(120.0f);
 	CDraw::ms_fLODDistance = 500.0f;
 	LoadingScreen("Loading the Game", "Setup streaming", nil);
-#ifndef MIAMI
-	CStreaming::Init();
-#endif
 	CStreaming::LoadInitialVehicles();
 	CStreaming::LoadInitialPeds();
 	CStreaming::RequestBigBuildings(LEVEL_NONE);
@@ -372,14 +367,7 @@ bool CGame::Initialise(const char* datFile)
 	CWaterCannons::Init();
 	CBridge::Init();
 	CGarages::Init();
-#ifndef MIAMI
-	LoadingScreen("Loading the Game", "Position dynamic objects", nil);
-	CWorld::RepositionCertainDynamicObjects();
-#endif
 	LoadingScreen("Loading the Game", "Initialise vehicle paths", nil);
-#ifdef GTA_ZONECULL
-	CCullZones::ResolveVisibilities();
-#endif
 	CTrain::InitTrains();
 	CPlane::InitPlanes();
 	CCredits::Init();
@@ -390,9 +378,6 @@ bool CGame::Initialise(const char* datFile)
 	CTheScripts::Process();
 	TheCamera.Process();
 	LoadingScreen("Loading the Game", "Load scene", nil);
-#ifndef MIAMI
-	CModelInfo::RemoveColModelsFromOtherLevels(currLevel);
-#endif
 	CCollision::ms_collisionInMemory = currLevel;
 	for (int i = 0; i < MAX_PADS; i++)
 		CPad::GetPad(i)->Clear(true);
@@ -532,12 +517,6 @@ void CGame::ReloadIPLs(void)
 	CRoadBlocks::Init();
 	CCranes::InitCranes();
 	CGarages::Init();
-#ifndef MIAMI
-	CWorld::RepositionCertainDynamicObjects();
-#endif
-#ifdef GTA_ZONECULL
-	CCullZones::ResolveVisibilities();
-#endif
 	CRenderer::SortBIGBuildings();
 	CTimer::Update();
 }
-- 
cgit v1.2.3