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

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-03-30 00:32:53 +02:00
parent bf3b4bc30e 1fd89923f6
commit 473681a12e
15 changed files with 336 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MdlMngr.cpp
View File

@@ -83,10 +83,10 @@ TModelsManager::GetModel(std::string const &Name, bool const Dynamic)
std::string filename { Name };
if( Name.find( '/' ) != std::string::npos && !Dynamic ) {
// 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;
Global.asCurrentTexturePath.erase( Global.asCurrentTexturePath.rfind( "/" ) + 1 );
Global.asCurrentTexturePath.erase( Global.asCurrentTexturePath.rfind( '/' ) + 1 );
}
erase_extension( filename );
filename = ToLower( filename );