eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-19 00:59:18 +02:00
Code Issues 121 Wiki Activity

Merge branch 'tmj-dev'

Browse Source
This commit is contained in:
milek7
2017-11-23 16:55:18 +01:00
parent d630c94e9e 672b34ef54
commit 0aaeda576e
3 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DynObj.cpp
View File

@@ -1956,7 +1956,8 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424"
0.0f );
}
++compartmentindex;
} while( submodel != nullptr );
} while( ( submodel != nullptr )
|| ( compartmentindex < 2 ) ); // chain can start from prefix00 or prefix01
}
}
// wyszukiwanie zderzakow
@@ -4041,8 +4042,13 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName,
}
else {
// Ra: tu wczytywanie modelu ładunku jest w porządku
if( false == asLoadName.empty() ) {
mdLoad = TModelsManager::GetModel( asLoadName, true ); // ladunek
if( false == asLoadName.empty() ) {
// try first specialized version of the load model, vehiclename_loadname
mdLoad = TModelsManager::GetModel( BaseDir + TypeName + "_" + MoverParameters->LoadType + ".t3d", true );
if( mdLoad == nullptr ) {
// if this fails, try generic load model
mdLoad = TModelsManager::GetModel( asLoadName, true );
}
}
}
}