Se.Cherkasov/re3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'miami' into lcs

Browse Source 
* miami:
  Use original names
This commit is contained in:
Sergeanur
2021-01-08 21:53:42 +02:00
parent 079b8e0e16 faa9e6441b
commit af09cb06f5
15 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modelinfo/SimpleModelInfo.cpp
View File

@@ -167,7 +167,7 @@ CSimpleModelInfo::FindRelatedModel(int32 minID, int32 maxID)
for(i = minID; i <= maxID; i++){
mi = CModelInfo::GetModelInfo(i);
if(mi && mi != this &&
!CGeneral::faststrcmp(GetName()+3, mi->GetName()+3)){
!CGeneral::faststrcmp(GetModelName()+3, mi->GetModelName()+3)){
assert(mi->IsSimple());
this->SetRelatedModel((CSimpleModelInfo*)mi);
return;
@@ -189,7 +189,7 @@ CSimpleModelInfo::SetupBigBuilding(int32 minID, int32 maxID)
m_lodDistances[2] = related->GetLargestLodDistance()/TheCamera.LODDistMultiplier;
if(m_drawLast){
m_drawLast = false;
debug("%s was draw last\n", GetName());
debug("%s was draw last\n", GetModelName());
}
}else
m_lodDistances[2] = NEAR_DRAW_DIST;