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

tmj merge (broken)

Browse Source
This commit is contained in:
milek7
2018-01-24 22:48:41 +01:00
parent c53ee61907 0dc1394d59
commit 45f28131a7
26 changed files with 539 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Button.cpp
View File

@@ -71,7 +71,7 @@ void TButton::Load( cParser &Parser, TDynamicObject const *Owner, TModel3d *pMod
if( ( pModelOn == nullptr )
&& ( pModelOff == nullptr ) ) {
// if we failed to locate even one state submodel, cry
ErrorLog( "Bad model: failed to locate sub-model \"" + submodelname + "\" in 3d model \"" + pModel1->NameGet() + "\"" );
ErrorLog( "Bad model: failed to locate sub-model \"" + submodelname + "\" in 3d model \"" + pModel1->NameGet() + "\"", logtype::model );
}
// pass submodel location to defined sounds
@@ -105,7 +105,7 @@ TButton::model_offset() const {
return (
submodel != nullptr ?
submodel->offset( 1.f ) :
submodel->offset( 2.5f ) :
glm::vec3() );
}