From faa9e6441bc4b02362620d0cf599a8513744f4cc Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Fri, 8 Jan 2021 21:53:11 +0200
Subject: Use original names

---
 src/core/FileLoader.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

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

diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index 9aaba611..b8201400 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -492,7 +492,7 @@ bool
 CFileLoader::StartLoadClumpFile(RwStream *stream, uint32 id)
 {
 	if(RwStreamFindChunk(stream, rwID_CLUMP, nil, nil)){
-		printf("Start loading %s\n", CModelInfo::GetModelInfo(id)->GetName());
+		printf("Start loading %s\n", CModelInfo::GetModelInfo(id)->GetModelName());
 		return RpClumpGtaStreamRead1(stream);
 	}else{
 		printf("FAILED\n");
@@ -506,7 +506,7 @@ CFileLoader::FinishLoadClumpFile(RwStream *stream, uint32 id)
 	RpClump *clump;
 	CClumpModelInfo *mi;
 
-	printf("Finish loading %s\n", CModelInfo::GetModelInfo(id)->GetName());
+	printf("Finish loading %s\n", CModelInfo::GetModelInfo(id)->GetModelName());
 	clump = RpClumpGtaStreamRead2(stream);
 
 	if(clump){
@@ -739,7 +739,7 @@ CFileLoader::LoadObject(const char *line)
 	}
 
 	mi = CModelInfo::AddSimpleModel(id);
-	mi->SetName(model);
+	mi->SetModelName(model);
 	mi->SetNumAtomics(numObjs);
 	mi->SetLodDistances(dist);
 	SetModelInfoFlags(mi, flags);
@@ -787,7 +787,7 @@ CFileLoader::LoadTimeObject(const char *line)
 	}
 
 	mi = CModelInfo::AddTimeModel(id);
-	mi->SetName(model);
+	mi->SetModelName(model);
 	mi->SetNumAtomics(numObjs);
 	mi->SetLodDistances(dist);
 	SetModelInfoFlags(mi, flags);
@@ -813,7 +813,7 @@ CFileLoader::LoadWeaponObject(const char *line)
 	sscanf(line, "%d %s %s %s %d %f", &id, model, txd, animFile, &numObjs, &dist);
 
 	mi = CModelInfo::AddWeaponModel(id);
-	mi->SetName(model);
+	mi->SetModelName(model);
 	mi->SetNumAtomics(1);
 	mi->m_lodDistances[0] = dist;
 	mi->SetTexDictionary(txd);
@@ -832,7 +832,7 @@ CFileLoader::LoadClumpObject(const char *line)
 
 	if(sscanf(line, "%d %s %s", &id, model, txd) == 3){
 		mi = CModelInfo::AddClumpModel(id);
-		mi->SetName(model);
+		mi->SetModelName(model);
 		mi->SetTexDictionary(txd);
 		mi->SetColModel(&CTempColModels::ms_colModelBBox);
 	}
@@ -856,7 +856,7 @@ CFileLoader::LoadVehicleObject(const char *line)
 		&frequency, &level, &comprules, &misc, &wheelScale);
 
 	mi = CModelInfo::AddVehicleModel(id);
-	mi->SetName(model);
+	mi->SetModelName(model);
 	mi->SetTexDictionary(txd);
 	mi->SetAnimFile(animFile);
 	for(p = gamename; *p; p++)
@@ -935,7 +935,7 @@ CFileLoader::LoadPedObject(const char *line)
 		  animFile, &radio1, &radio2);
 
 	mi = CModelInfo::AddPedModel(id);
-	mi->SetName(model);
+	mi->SetModelName(model);
 	mi->SetTexDictionary(txd);
 	mi->SetAnimFile(animFile);
 	mi->SetColModel(&CTempColModels::ms_colModelPed1);
@@ -1205,7 +1205,7 @@ CFileLoader::LoadObjectInstance(const char *line)
 	assert(mi->IsSimple());
 
 	if(!CStreaming::IsObjectInCdImage(id))
-		debug("Not in cdimage %s\n", mi->GetName());
+		debug("Not in cdimage %s\n", mi->GetModelName());
 
 	angle = -RADTODEG(2.0f * acosf(angle));
 	xform = RwMatrixCreate();
@@ -1438,7 +1438,7 @@ CFileLoader::ReloadObject(const char *line)
 #ifdef FIX_BUGS
 		mi &&
 #endif
-	    mi->GetModelType() == MITYPE_SIMPLE && !strcmp(mi->GetName(), model) && mi->m_numAtomics == numObjs) {
+	    mi->GetModelType() == MITYPE_SIMPLE && !strcmp(mi->GetModelName(), model) && mi->m_numAtomics == numObjs) {
 		mi->SetLodDistances(dist);
 		SetModelInfoFlags(mi, flags);
 	} else {
-- 
cgit v1.2.3