diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-01-08 20:53:42 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-01-08 20:53:42 +0100 |
| commit | af09cb06f5c148f16c1bd1b5f20e766a15abe8c4 (patch) | |
| tree | 0260b5d6504e05b1e6f009015638c7ef0115ca5f /src/core/FileLoader.cpp | |
| parent | CKeyGen (diff) | |
| parent | Use original names (diff) | |
| download | re3-af09cb06f5c148f16c1bd1b5f20e766a15abe8c4.tar re3-af09cb06f5c148f16c1bd1b5f20e766a15abe8c4.tar.gz re3-af09cb06f5c148f16c1bd1b5f20e766a15abe8c4.tar.bz2 re3-af09cb06f5c148f16c1bd1b5f20e766a15abe8c4.tar.lz re3-af09cb06f5c148f16c1bd1b5f20e766a15abe8c4.tar.xz re3-af09cb06f5c148f16c1bd1b5f20e766a15abe8c4.tar.zst re3-af09cb06f5c148f16c1bd1b5f20e766a15abe8c4.zip | |
Diffstat (limited to 'src/core/FileLoader.cpp')
| -rw-r--r-- | src/core/FileLoader.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp index f711407a..3ea73233 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); } @@ -857,7 +857,7 @@ CFileLoader::LoadVehicleObject(const char *line) &normalSplay); mi = CModelInfo::AddVehicleModel(id); - mi->SetName(model); + mi->SetModelName(model); mi->SetTexDictionary(txd); mi->SetAnimFile(animFile); for(p = gamename; *p; p++) @@ -938,7 +938,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); @@ -1208,7 +1208,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(); @@ -1441,7 +1441,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 { |