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

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2019-01-20 15:30:55 +01:00
parent b648ca7c44 0ad2a142c1
commit 0150d633b2
4 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Button.cpp
View File

@@ -18,11 +18,10 @@ http://mozilla.org/MPL/2.0/.
void TButton::Clear(int i)
{
pModelOn = nullptr;
pModelOff = nullptr;
m_state = false;
if (i >= 0)
FeedbackBitSet(i);
*this = TButton();
if( i >= 0 ) {
FeedbackBitSet( i );
}
Update(); // kasowanie bitu Feedback, o ile jakiś ustawiony
};
@@ -63,7 +62,7 @@ void TButton::Load( cParser &Parser, TDynamicObject const *Owner ) {
std::array<TModel3d *, 3> sources { Owner->mdKabina, Owner->mdLowPolyInt, Owner->mdModel };
for( auto const *source : sources ) {
if( true == Init( submodelname, source, false ) ) {
// got what we wanted, bail out
// got what we wanted, don't need to search further
break;
}
}