eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'd8170c932b448ba6888e702746b5ae22632062d8' into sim

Browse Source
This commit is contained in:
milek7
2022-01-05 01:02:56 +01:00
parent ff3c38a506 d8170c932b
commit 5bafa31f9d
76 changed files with 9277 additions and 5749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MdlMngr.cpp
View File

@@ -81,7 +81,8 @@ TModelsManager::GetModel(std::string const &Name, bool const Dynamic, bool const
// - wczytanie modelu animowanego - Init() - sprawdzić
std::string const buftp { Global.asCurrentTexturePath }; // zapamiętanie aktualnej ścieżki do tekstur,
std::string filename { Name };
if( Name.find( '/' ) != std::string::npos && !Dynamic ) {
if( ( false == Dynamic )
&& ( contains( Name, '/' ) ) ) {
// pobieranie tekstur z katalogu, w którym jest model
// when loading vehicles the path is set by the calling routine, so we can skip it here
Global.asCurrentTexturePath += Name;
@@ -110,7 +111,7 @@ TModelsManager::GetModel(std::string const &Name, bool const Dynamic, bool const
else {
// there's nothing matching in the databank nor on the disk, report failure...
if( Logerrors ) {
ErrorLog( "Bad file: failed to locate 3d model file \"" + filename + "\"", logtype::file );
ErrorLog( "Bad file: failed to locate 3d model file \"" + filename + "\"", logtype::file );
}
// ...and link it with the error model slot
m_modelsmap.emplace( filename + postfix, null_handle );