From 7428590457d6822c7a2861b64185c8ff447530c2 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Tue, 5 May 2020 18:31:53 +0200
Subject: [PATCH] some miami limits

---
 src/core/config.h           | 35 +++++++++++++++++------------------
 src/modelinfo/ModelInfo.cpp |  7 -------
 src/modelinfo/ModelInfo.h   |  4 ----
 3 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/src/core/config.h b/src/core/config.h
index 2109f3b9..902b0686 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -13,31 +13,30 @@ enum Config {
 	EXTRADIRSIZE = 128,
 	CUTSCENEDIRSIZE = 512,
 
-	SIMPLEMODELSIZE = 5000,
-	MLOMODELSIZE = 1,
-	MLOINSTANCESIZE = 1,
-	TIMEMODELSIZE = 30,
+	SIMPLEMODELSIZE = 5000,	// only 3885 in VC???
+	TIMEMODELSIZE = 385,
 	CLUMPMODELSIZE = 5,
-	PEDMODELSIZE = 90,
-	VEHICLEMODELSIZE = 120,
-	XTRACOMPSMODELSIZE = 2,
-	TWODFXSIZE = 2000,
+	WEAPONMODELSIZE = 37,
+	PEDMODELSIZE = 130,
+	VEHICLEMODELSIZE = 120,	// only 110 in VC???
+	TWODFXSIZE = 2000,	// only 1210 in VC???
 
 	MAXVEHICLESLOADED = 50, // 70 on mobile
 
 	NUMOBJECTINFO = 168, // object.dat
 
 	// Pool sizes
-	NUMPTRNODES = 30000,  // 26000 on PS2
-	NUMENTRYINFOS = 5400, // 3200 on PS2
-	NUMPEDS = 140,        // 90 on PS2
-	NUMVEHICLES = 110,    // 70 on PS2
-	NUMBUILDINGS = 5500,  // 4915 on PS2
-	NUMTREADABLES = 1214,
-	NUMOBJECTS = 450,
-	NUMDUMMIES = 2802, // 2368 on PS2
-	NUMAUDIOSCRIPTOBJECTS = 256,
-	NUMCUTSCENEOBJECTS = 50,
+	NUMPTRNODES = 50000,
+	NUMENTRYINFOS = 5400, // only 3200 in VC???
+	NUMPEDS = 140,
+	NUMVEHICLES = 110,
+	NUMBUILDINGS = 7000,
+	NUMTREADABLES = 1214,	// 1 in VC
+	NUMOBJECTS = 460,
+	NUMDUMMIES = 2802, // 2340 in VC
+	NUMAUDIOSCRIPTOBJECTS = 256,	// 192 in VC
+	NUMCUTSCENEOBJECTS = 50,	// does not exist in VC
+	// TODO(MIAMI): colmodel pool
 
 	NUMTEMPOBJECTS = 30,
 
diff --git a/src/modelinfo/ModelInfo.cpp b/src/modelinfo/ModelInfo.cpp
index dab43fba..79353b1b 100644
--- a/src/modelinfo/ModelInfo.cpp
+++ b/src/modelinfo/ModelInfo.cpp
@@ -8,7 +8,6 @@
 CBaseModelInfo *CModelInfo::ms_modelInfoPtrs[MODELINFOSIZE];
 
 CStore<CSimpleModelInfo, SIMPLEMODELSIZE> CModelInfo::ms_simpleModelStore;
-CStore<CInstance, MLOINSTANCESIZE> CModelInfo::ms_mloInstanceStore;
 CStore<CTimeModelInfo, TIMEMODELSIZE> CModelInfo::ms_timeModelStore;
 CStore<CClumpModelInfo, CLUMPMODELSIZE> CModelInfo::ms_clumpModelStore;
 CStore<CPedModelInfo, PEDMODELSIZE> CModelInfo::ms_pedModelStore;
@@ -24,7 +23,6 @@ CModelInfo::Initialise(void)
 	for(i = 0; i < MODELINFOSIZE; i++)
 		ms_modelInfoPtrs[i] = nil;
 	ms_2dEffectStore.clear();
-	ms_mloInstanceStore.clear();
 	ms_simpleModelStore.clear();
 	ms_timeModelStore.clear();
 	ms_clumpModelStore.clear();
@@ -86,8 +84,6 @@ CModelInfo::ShutDown(void)
 	int i;
 	for(i = 0; i < ms_simpleModelStore.allocPtr; i++)
 		ms_simpleModelStore.store[i].Shutdown();
-	for(i = 0; i < ms_mloInstanceStore.allocPtr; i++)
-		ms_mloInstanceStore.store[i].Shutdown();
 	for(i = 0; i < ms_timeModelStore.allocPtr; i++)
 		ms_timeModelStore.store[i].Shutdown();
 	for(i = 0; i < ms_clumpModelStore.allocPtr; i++)
@@ -96,14 +92,11 @@ CModelInfo::ShutDown(void)
 		ms_vehicleModelStore.store[i].Shutdown();
 	for(i = 0; i < ms_pedModelStore.allocPtr; i++)
 		ms_pedModelStore.store[i].Shutdown();
-	for(i = 0; i < ms_mloInstanceStore.allocPtr; i++)
-		ms_mloInstanceStore.store[i].Shutdown();
 	for(i = 0; i < ms_2dEffectStore.allocPtr; i++)
 		ms_2dEffectStore.store[i].Shutdown();
 
 	ms_2dEffectStore.clear();
 	ms_simpleModelStore.clear();
-	ms_mloInstanceStore.clear();
 	ms_timeModelStore.clear();
 	ms_pedModelStore.clear();
 	ms_clumpModelStore.clear();
diff --git a/src/modelinfo/ModelInfo.h b/src/modelinfo/ModelInfo.h
index 17428936..46f8c117 100644
--- a/src/modelinfo/ModelInfo.h
+++ b/src/modelinfo/ModelInfo.h
@@ -13,7 +13,6 @@ class CModelInfo
 {
 	static CBaseModelInfo *ms_modelInfoPtrs[MODELINFOSIZE];
 	static CStore<CSimpleModelInfo, SIMPLEMODELSIZE> ms_simpleModelStore;
-	static CStore<CInstance, MLOINSTANCESIZE> ms_mloInstanceStore;
 	static CStore<CTimeModelInfo, TIMEMODELSIZE> ms_timeModelStore;
 	static CStore<CClumpModelInfo, CLUMPMODELSIZE> ms_clumpModelStore;
 	static CStore<CPedModelInfo, PEDMODELSIZE> ms_pedModelStore;
@@ -31,7 +30,6 @@ public:
 	static CVehicleModelInfo *AddVehicleModel(int id);
 
 	static CStore<C2dEffect, TWODFXSIZE> &Get2dEffectStore(void) { return ms_2dEffectStore; }
-	static CStore<CInstance, MLOINSTANCESIZE> &GetMloInstanceStore(void) { return ms_mloInstanceStore; }
 
 	static CBaseModelInfo *GetModelInfo(const char *name, int *id);
 	static CBaseModelInfo *GetModelInfo(int id){
@@ -41,7 +39,5 @@ public:
 
 	static bool IsBoatModel(int32 id);
 	static bool IsBikeModel(int32 id);
-	static void RemoveColModelsFromOtherLevels(eLevelName level);
-	static void ConstructMloClumps();
 	static void ReInit2dEffects();
 };