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

Merge branch 'tmj-dev' into dev

Browse Source
This commit is contained in:
milek7
2017-12-25 18:27:10 +01:00
parent 0aaeda576e 1b5e6aafd1
commit a215a0f8b3
65 changed files with 5288 additions and 4558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
material.cpp
View File

@@ -103,7 +103,7 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) {
// try to locate requested material in the databank
auto const databanklookup = find_in_databank( filename );
if( databanklookup != npos ) {
if( databanklookup != null_handle ) {
return databanklookup;
}
// if this fails, try to look for it on disk
@@ -147,7 +147,7 @@ material_manager::find_in_databank( std::string const &Materialname ) const {
return (
lookup != m_materialmappings.end() ?
lookup->second :
npos );
null_handle );
}
// checks whether specified file exists.