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

reformat: remove redundant parentheses

Browse Source
This commit is contained in:
jerrrrycho
2026-06-30 21:19:46 +02:00
parent 7c88907f6b
commit d85096f64d
108 changed files with 4098 additions and 4662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
vehicle/Button.cpp
View File

@@ -34,7 +34,7 @@ bool TButton::Init( std::string const &asName, TModel3d const *pModel, bool bNew
m_state = bNewOn;
Update();
return( ( pModelOn != nullptr ) || ( pModelOff != nullptr ) );
return pModelOn != nullptr || pModelOff != nullptr;
};
void TButton::Load( cParser &Parser, TDynamicObject const *Owner ) {
@@ -66,8 +66,8 @@ void TButton::Load( cParser &Parser, TDynamicObject const *Owner ) {
break;
}
}
if( ( pModelOn == nullptr )
&& ( pModelOff == nullptr ) ) {
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(s) of \"" + Owner->name() + "\"", logtype::model );
}
@@ -88,7 +88,7 @@ TButton::Load_mapping( cParser &Input ) {
// token can be a key or block end
std::string const key { Input.getToken<std::string>( true, "\n\r\t ,;" ) };
if( ( true == key.empty() ) || ( key == "}" ) ) { return false; }
if( true == key.empty() || key == "}" ) { return false; }
// if not block end then the key is followed by assigned value or sub-block
if( key == "soundinc:" ) { m_soundfxincrease.deserialize( Input, sound_type::single ); }
else if( key == "sounddec:" ) { m_soundfxdecrease.deserialize( Input, sound_type::single ); }
@@ -106,10 +106,7 @@ TButton::model_offset() const {
pModelOff ? pModelOff :
nullptr ) };
return (
submodel != nullptr ?
submodel->offset( std::numeric_limits<float>::max() ) :
glm::vec3() );
return submodel != nullptr ? submodel->offset(std::numeric_limits<float>::max()) : glm::vec3();
}
void
@@ -135,7 +132,7 @@ void TButton::Update( bool const Power ) {
}
if( pModelOn != nullptr ) { pModelOn->iVisible = m_state; }
if( pModelOff != nullptr ) { pModelOff->iVisible = (!m_state); }
if( pModelOff != nullptr ) { pModelOff->iVisible = !m_state; }
#ifdef _WIN32
if (iFeedbackBit) {