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

Merge remote-tracking branch 'Milek7/lua' into mover_in_c++

Browse Source 
Merge remote-tracking branch 'Milek7/lua' into mover_in_c++
This commit is contained in:
firleju
2017-10-06 16:27:53 +02:00
parent c5097876e5
commit cd80c2ded6
12 changed files with 117 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
material.cpp
View File

@@ -39,8 +39,8 @@ opengl_material::deserialize_mapping( cParser &Input, bool const Loadnow ) {
}
std::string path;
if( name.rfind( '\\' ) != std::string::npos ) {
path = name.substr( 0, name.rfind( '\\' ) + 1 );
if( name.rfind( '/' ) != std::string::npos ) {
path = name.substr( 0, name.rfind( '/' ) + 1 );
}
std::string key, value;