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

set anim flag for cargo models, so that floor level from .fiz always works properly

Browse Source
This commit is contained in:
milek7
2022-03-30 00:54:48 +02:00
parent 5e72bc1a55
commit 947c448e1b
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DynObj.cpp
View File

@@ -6769,28 +6769,30 @@ TDynamicObject::LoadMMediaFile_mdload( std::string const &Name ) const {
TModel3d *loadmodel { nullptr }; TModel3d *loadmodel { nullptr };
// check if we don't have model override for this load type // check if we don't have model override for this load type
if ( loadmodel == nullptr )
{ {
auto const lookup { LoadModelOverrides.find( loadname ) }; auto const lookup { LoadModelOverrides.find( loadname ) };
if( lookup != LoadModelOverrides.end() ) { if( lookup != LoadModelOverrides.end() ) {
loadmodel = TModelsManager::GetModel( asBaseDir + lookup->second, true ); loadmodel = TModelsManager::GetModel( asBaseDir + lookup->second, true );
// if the override was succesfully loaded call it a day
if( loadmodel != nullptr ) { return loadmodel; }
} }
} }
// regular routine if there's no override or it couldn't be loaded // regular routine if there's no override or it couldn't be loaded
// try first specialized version of the load model, vehiclename_loadname // try first specialized version of the load model, vehiclename_loadname
if ( loadmodel == nullptr )
{ {
auto const specializedloadfilename { asBaseDir + MoverParameters->TypeName + "_" + loadname }; auto const specializedloadfilename { asBaseDir + MoverParameters->TypeName + "_" + loadname };
loadmodel = TModelsManager::GetModel( specializedloadfilename, true, false ); loadmodel = TModelsManager::GetModel( specializedloadfilename, true, false );
if( loadmodel != nullptr ) { return loadmodel; }
} }
// try generic version of the load model next, loadname // try generic version of the load model next, loadname
if ( loadmodel == nullptr )
{ {
auto const genericloadfilename { asBaseDir + loadname }; auto const genericloadfilename { asBaseDir + loadname };
loadmodel = TModelsManager::GetModel( genericloadfilename, true, false ); loadmodel = TModelsManager::GetModel( genericloadfilename, true, false );
if( loadmodel != nullptr ) { return loadmodel; }
} }
// if we're still here, give up
if ( loadmodel != nullptr )
loadmodel->GetSMRoot()->WillBeAnimated();
return loadmodel; return loadmodel;
} }