From 947c448e1b569abd51eeb4446b5019d2d88af76e Mon Sep 17 00:00:00 2001 From: milek7 Date: Wed, 30 Mar 2022 00:54:48 +0200 Subject: [PATCH] set anim flag for cargo models, so that floor level from .fiz always works properly --- DynObj.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 5ccfcfbd..4156ede5 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -6769,28 +6769,30 @@ TDynamicObject::LoadMMediaFile_mdload( std::string const &Name ) const { TModel3d *loadmodel { nullptr }; // check if we don't have model override for this load type + if ( loadmodel == nullptr ) { auto const lookup { LoadModelOverrides.find( loadname ) }; if( lookup != LoadModelOverrides.end() ) { 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 // try first specialized version of the load model, vehiclename_loadname + if ( loadmodel == nullptr ) { auto const specializedloadfilename { asBaseDir + MoverParameters->TypeName + "_" + loadname }; loadmodel = TModelsManager::GetModel( specializedloadfilename, true, false ); - if( loadmodel != nullptr ) { return loadmodel; } } // try generic version of the load model next, loadname + if ( loadmodel == nullptr ) { auto const genericloadfilename { asBaseDir + loadname }; 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; }