4 files changed, 9 insertions, 7 deletions

diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/animation/AnimBlendAssocGroup.cpp
index 7c0a10d4..f56e5f20 100644
--- a/src/animation/AnimBlendAssocGroup.cpp
+++ b/src/animation/AnimBlendAssocGroup.cpp
@@ -132,7 +132,7 @@ GetModelFromName(const char *name)
 	}
 
 	uint32 hashKey = CKeyGen::GetUppercaseKey(name);
-	for (i = 0; i < MODELINFOSIZE; i++) {
+	for (i = 0; i < CModelInfo::GetNumModelInfos(); i++) {
 		mi = CModelInfo::GetModelInfo(i);
 		if (mi && mi->GetRwObject()
 			&& RwObjectGetType(mi->GetRwObject()) == rpCLUMP &&
diff --git a/src/core/AnimViewer.cpp b/src/core/AnimViewer.cpp
index dc9b44cb..e3e19cd2 100644
--- a/src/core/AnimViewer.cpp
+++ b/src/core/AnimViewer.cpp
@@ -92,7 +92,7 @@ CAnimViewer::Initialise(void) {
 	CFileLoader::LoadLevel("DATA\\DEFAULT.DAT");
 	CFileLoader::LoadLevel("DATA\\ANIMVIEWER.DAT");
 	CStreaming::Init();
-	for(int i = 0; i < MODELINFOSIZE; i++)
+	for(int i = 0; i < CModelInfo::GetNumModelInfos(); i++)
 		if(CModelInfo::GetModelInfo(i))
 			CModelInfo::GetModelInfo(i)->ConvertAnimFileIndex();
 	CStreaming::LoadInitialPeds();
@@ -166,7 +166,7 @@ LastPedModelId(int modelId)
 {
 	CBaseModelInfo *model;
 	for(;;){
-		assert(modelId < MODELINFOSIZE);
+		assert(modelId < CModelInfo::GetNumModelInfos());
 		model = CModelInfo::GetModelInfo(modelId);
 		if (model && model->GetModelType() == MITYPE_PED)
 			break;
@@ -180,7 +180,7 @@ FirstCarModelId(int modelId)
 {
 	CBaseModelInfo *model;
 	for(;;){
-		assert(modelId < MODELINFOSIZE);
+		assert(modelId < CModelInfo::GetNumModelInfos());
 		model = CModelInfo::GetModelInfo(modelId);
 		if (model && model->GetModelType() == MITYPE_VEHICLE)
 			break;
@@ -200,7 +200,7 @@ NextModelId(int modelId, int wantedChange)
 
 	while(tryCount != 0) {
 		modelId += wantedChange;
-		if (modelId < 0 || modelId >= MODELINFOSIZE) {
+		if (modelId < 0 || modelId >= CModelInfo::GetNumModelInfos()) {
 			tryCount--;
 			wantedChange = -wantedChange;
 		} else if (modelId != 5 && modelId != 6 && modelId != 405) {
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index 03b78392..f62ff179 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -180,7 +180,7 @@ CStreaming::Init2(void)
 
 	// init stream info, mark things that are already loaded
 
-	for(i = 0; i < MODELINFOSIZE; i++){
+	for(i = 0; i < CModelInfo::GetNumModelInfos(); i++){
 		CBaseModelInfo *mi = CModelInfo::GetModelInfo(i);
 		if(mi && mi->GetRwObject()){
 			ms_aInfoForModel[i].m_loadState = STREAMSTATE_LOADED;
diff --git a/src/modelinfo/ModelInfo.h b/src/modelinfo/ModelInfo.h
index 1e401247..60a5e98f 100644
--- a/src/modelinfo/ModelInfo.h
+++ b/src/modelinfo/ModelInfo.h
@@ -25,10 +25,11 @@ class CModelInfo
 	static CStore<CVehicleModelInfo, VEHICLEMODELSIZE> ms_vehicleModelStore;
 	static CStore<C2dEffect, TWODFXSIZE> ms_2dEffectStore;
 
+public:
 	// these fields are in the resource image
 	int32 resNumModelInfos;
 	CBaseModelInfo **resModelInfoPtrs;
-public:
+
 	static void Initialise(void);
 	static void ShutDown(void);
 
@@ -43,6 +44,7 @@ public:
 	static C2dEffect *Get2dEffect(int32 id) { return &gp2dEffects[id]; }
 	static int32 Get2dEffectIndex(C2dEffect *effect) { return effect - gp2dEffects; }
 
+	static int32 GetNumModelInfos(void) { return msNumModelInfos; }
 	static CBaseModelInfo *GetModelInfo(const char *name, int *id);
 	static CBaseModelInfo *GetModelInfo(int id){
 		if(id < 0 || id >= msNumModelInfos)