From 8cbae5d62afa975a51ce7ec9be3018b473d81011 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Sun, 24 Jan 2021 13:40:33 +0100
Subject: CSimpleModelInfo

---
 src/core/FileLoader.cpp | 35 ++++++++++++++++++++++++++---------
 src/core/Leeds.cpp      | 14 ++++++++++++++
 src/core/Leeds.h        | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 9 deletions(-)
 create mode 100644 src/core/Leeds.cpp
 create mode 100644 src/core/Leeds.h

(limited to 'src/core')

diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index c13252f6..eed12e58 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -607,11 +607,14 @@ CFileLoader::LoadObjectTypes(const char *filename)
 	int section;
 	int pathIndex;
 	int id, pathType;
-	int minID, maxID;
+	//int minID, maxID;
+
+	for(int i = 0; i < ARRAY_SIZE(m_sTempIdeData); i++)
+		m_sTempIdeData[i].id = -1;
 
 	section = NONE;
-	minID = INT32_MAX;
-	maxID = -1;
+	//minID = INT32_MAX;
+	//maxID = -1;
 	pathIndex = -1;
 	debug("Loading object types from %s...\n", filename);
 
@@ -635,13 +638,13 @@ CFileLoader::LoadObjectTypes(const char *filename)
 		}else switch(section){
 		case OBJS:
 			id = LoadObject(line);
-			if(id > maxID) maxID = id;
-			if(id < minID) minID = id;
+			//if(id > maxID) maxID = id;
+			//if(id < minID) minID = id;
 			break;
 		case TOBJ:
 			id = LoadTimeObject(line);
-			if(id > maxID) maxID = id;
-			if(id < minID) minID = id;
+			//if(id > maxID) maxID = id;
+			//if(id < minID) minID = id;
 			break;
 		case WEAP:
 			LoadWeaponObject(line);
@@ -678,10 +681,10 @@ CFileLoader::LoadObjectTypes(const char *filename)
 	}
 	CFileMgr::CloseFile(fd);
 
-	for(id = minID; id <= maxID; id++){
+	for(id = 0; id < MODELINFOSIZE; id++){
 		CSimpleModelInfo *mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(id);
 		if(mi && mi->IsBuilding())
-			mi->SetupBigBuilding(minID, maxID);
+			mi->SetupBigBuilding();
 	}
 }
 
@@ -714,6 +717,13 @@ CFileLoader::LoadObject(const char *line)
 	if(sscanf(line, "%d %s %s %d", &id, model, txd, &numObjs) != 4)
 		return 0;	// game returns return value
 
+	for(int i = 0; i < ARRAY_SIZE(m_sTempIdeData); i++)
+		if(m_sTempIdeData[i].id == -1){
+			m_sTempIdeData[i].id = id;
+			strcpy(m_sTempIdeData[i].name, model);
+			break;
+		}
+
 	switch(numObjs){
 	case 1:
 		sscanf(line, "%d %s %s %d %f %d",
@@ -762,6 +772,13 @@ CFileLoader::LoadTimeObject(const char *line)
 	if(sscanf(line, "%d %s %s %d", &id, model, txd, &numObjs) != 4)
 		return 0;	// game returns return value
 
+	for(int i = 0; i < ARRAY_SIZE(m_sTempIdeData); i++)
+		if(m_sTempIdeData[i].id < 0){
+			m_sTempIdeData[i].id = id;
+			strcpy(m_sTempIdeData[i].name, model);
+			break;
+		}
+
 	switch(numObjs){
 	case 1:
 		sscanf(line, "%d %s %s %d %f %d %d %d",
diff --git a/src/core/Leeds.cpp b/src/core/Leeds.cpp
new file mode 100644
index 00000000..cda50605
--- /dev/null
+++ b/src/core/Leeds.cpp
@@ -0,0 +1,14 @@
+#include "common.h"
+#include "Leeds.h"
+
+void LoadResource(RpAtomic *atomic) {}
+void LoadResource(RpClump *clump) {}
+
+
+void SaveResource(RwTexture *tex, base::cRelocatableChunkWriter &writer) {}
+void SaveResource(RwTexDictionary *txd, base::cRelocatableChunkWriter &writer) {}
+void SaveResource(RpMaterial *mat, base::cRelocatableChunkWriter &writer) {}
+void SaveResource(RpMaterialList *matlist, base::cRelocatableChunkWriter &writer) {}
+void SaveResource(RpGeometry *geo, base::cRelocatableChunkWriter &writer) {}
+void SaveResource(RpAtomic *atomic, base::cRelocatableChunkWriter &writer) {}
+void SaveResource(RpClump *clump, base::cRelocatableChunkWriter &writer) {}
diff --git a/src/core/Leeds.h b/src/core/Leeds.h
new file mode 100644
index 00000000..bf71d7e0
--- /dev/null
+++ b/src/core/Leeds.h
@@ -0,0 +1,36 @@
+#pragma once
+
+/*
+PatchElementModelInfo(RslElement *,void *)
+ChunkName(char const*)
+DestroyAndFreeResourceImage(void)
+WriteOrder(char const*)
+UnpatchTextures(void)
+IsChunked(int)
+SaveResourceImage(void)
+LoadResourceImage(void)
+SaveResource(RslNode *,base::cRelocatableChunkWriter &)
+SaveResource(RslTAnimTree *,base::cRelocatableChunkWriter &)
+SaveResource(RslSkin *,base::cRelocatableChunkWriter &)
+SaveResource(CAnimBlendTree *,base::cRelocatableChunkWriter &)
+PatchElementTextures(RslElement *)
+PatchElementGroupTextures(RslElementGroup *)
+*/
+
+void LoadResource(RpAtomic *atomic);
+void LoadResource(RpClump *clump);
+
+/*
+cRelocatableChunkWriterGTA::Save(char const*,uint,uint,bool)
+cRelocatableChunkGTA::cRelocatableChunkGTA(char const*,uint,uint,bool)
+SaveAnimBlock(int)
+SaveModel(int,bool)
+*/
+
+void SaveResource(RwTexture *tex, base::cRelocatableChunkWriter &writer);
+void SaveResource(RwTexDictionary *txd, base::cRelocatableChunkWriter &writer);
+void SaveResource(RpMaterial *mat, base::cRelocatableChunkWriter &writer);
+void SaveResource(RpMaterialList *matlist, base::cRelocatableChunkWriter &writer);
+void SaveResource(RpGeometry *geo, base::cRelocatableChunkWriter &writer);
+void SaveResource(RpAtomic *atomic, base::cRelocatableChunkWriter &writer);
+void SaveResource(RpClump *clump, base::cRelocatableChunkWriter &writer);
-- 
cgit v1.2.3