diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 251c0f70..a3d8de7b 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1715,9 +1715,7 @@ void TMoverParameters::LowVoltagePowerCheck(double const /*Deltatime*/) auto const lowvoltagepower{Power24vIsAvailable || Power110vIsAvailable}; - switch (EngineType) - { - case TEngineType::ElectricSeriesMotor: + if (EngineType == TEngineType::ElectricSeriesMotor) { GroundRelay &= lowvoltagepower; if (GroundRelayStart != start_t::manual) @@ -1726,12 +1724,6 @@ void TMoverParameters::LowVoltagePowerCheck(double const /*Deltatime*/) // TODO: generic check method which takes these into account GroundRelay |= lowvoltagepower; } - break; - } - default: - { - break; - } } } @@ -1780,17 +1772,9 @@ void TMoverParameters::PowerCouplersCheck(double const /*Deltatime*/, coupling c } } // high voltage power sources - switch (EnginePowerSource.SourceType) - { - case TPowerSource::CurrentCollector: + if (EnginePowerSource.SourceType == TPowerSource::CurrentCollector) { localvoltage = std::max(localvoltage, PantographVoltage); - break; - } - default: - { - break; - } } break; } @@ -2066,9 +2050,7 @@ void TMoverParameters::HeatingCheck(double const /*Timestep*/) // update heating devices // TBD, TODO: move this to a separate method? - switch (HeatingPowerSource.SourceType) - { - case TPowerSource::Generator: + if (HeatingPowerSource.SourceType == TPowerSource::Generator) { if (HeatingPowerSource.EngineGenerator.engine_revolutions != nullptr && HeatingPowerSource.EngineGenerator.revolutions_max > 0) { @@ -2087,12 +2069,6 @@ void TMoverParameters::HeatingCheck(double const /*Timestep*/) std::clamp((absrevolutions - generator.revolutions_min) / (generator.revolutions_max - generator.revolutions_min), 0.0, 1.0))) * sign(generator.revolutions); } - break; - } - default: - { - break; - } } // quick check first to avoid unnecessary calls... @@ -4392,21 +4368,16 @@ void TMoverParameters::CompressorCheck(double dt) } // working compressor adds air to the air reservoir - switch (CompressorPower) - { - case 3: + if (CompressorPower == 3) { // the compressor is coupled with the diesel engine, engine revolutions affect the output CompressedVolume += CompressorSpeedF * (2.0 * MaxCompressorF - Compressor) / MaxCompressorF * EngineRPMRatio() * dt * (CompressorGovernorLock ? 0.0 : 1.0); // with the lock active air is vented out - break; } - default: + else { // the compressor is a stand-alone device, working at steady pace CompressedVolume += CompressorSpeedF * (2.0 * MaxCompressorF - Compressor) / MaxCompressorF * dt; - break; - } } if (pressureistoohigh && (false == governorlockispresent || CompressorPower == 3)) @@ -4424,14 +4395,11 @@ void TMoverParameters::CompressorCheck(double dt) // tymczasowo tylko obciążenie sprężarki, tak z 5A na sprężarkę // TODO: draw power from proper high- or low voltage circuit - switch (CompressorPower) - { - case 3: + if (CompressorPower == 3) { // diesel-powered compressor doesn't draw power - break; } - default: + else { // TODO: drain power from 110v circuit /* @@ -4439,8 +4407,6 @@ void TMoverParameters::CompressorCheck(double dt) compressorowner->TotalCurrent += 0.0015 * compressorowner->PantographVoltage; } */ - break; - } } } @@ -6523,18 +6489,10 @@ double TMoverParameters::TractionForce(double dt) } } // case EngineType - switch (EngineType) - { - case TEngineType::DieselElectric: + if (EngineType == TEngineType::DieselElectric) { // rough approximation of extra effort to overcome friction etc EnginePower += EngineRPMRatio() * 0.15 * DElist[MainCtrlPosNo].GenPower; - break; - } - default: - { - break; - } } return Ft; @@ -8864,9 +8822,7 @@ bool TMoverParameters::ChangeOffsetH(double DeltaOffset) std::string TMoverParameters::EngineDescription(int what) const { std::string outstr{"OK"}; - switch (what) - { - case 0: + if (what == 0) { if (DamageFlag == 255) { @@ -8916,13 +8872,10 @@ std::string TMoverParameters::EngineDescription(int what) const outstr = "DERAILED"; } } - break; } - default: + else { outstr = "Invalid qualifier"; - break; - } } return outstr; } @@ -9066,18 +9019,13 @@ bool TMoverParameters::readMPT0(std::string const &line) { return false; } - switch (EngineType) - { - case TEngineType::DieselEngine: + if (EngineType == TEngineType::DieselEngine) { parser >> MotorParam[idx].mIsat >> MotorParam[idx].fi0 >> MotorParam[idx].fi >> MotorParam[idx].mfi0 >> MotorParam[idx].mfi >> MotorParam[idx].Isat; - break; } - default: + else { parser >> MotorParam[idx].mfi >> MotorParam[idx].mIsat >> MotorParam[idx].mfi0 >> MotorParam[idx].fi >> MotorParam[idx].Isat >> MotorParam[idx].fi0; - break; - } } if (true == parser.getTokens(1, false)) { diff --git a/rendering/particles.cpp b/rendering/particles.cpp index bf5a602f..5f7158e0 100644 --- a/rendering/particles.cpp +++ b/rendering/particles.cpp @@ -330,8 +330,8 @@ smoke_source::initialize( smoke_particle &Particle ) { if( m_ownertype == owner_type::vehicle ) { Particle.opacity *= static_cast(m_owner.vehicle->MoverParameters->dizel_fill); - switch( m_owner.vehicle->MoverParameters->EngineType ) { - case TEngineType::DieselElectric: { + if (m_owner.vehicle->MoverParameters->EngineType == TEngineType::DieselElectric) + { if (m_owner.vehicle->MoverParameters->dizel_spinup == true) { Particle.velocity *= 0.38*(((m_owner.vehicle->MoverParameters->enrot)/2)*0.5); // / m_owner.vehicle->MoverParameters->dizel_fill *0.01)) ; @@ -344,11 +344,6 @@ smoke_source::initialize( smoke_particle &Particle ) { //Particle.velocity *= m_owner.vehicle->GetVelocity(); // / m_owner.vehicle->MoverParameters->dizel_fill *0.01)) ; } - break; - } - default: { - break; - } } } } @@ -365,22 +360,17 @@ smoke_source::update( smoke_particle &Particle, bounding_box &Boundingbox, doubl // crude smoke dispersion simulation // http://www.auburn.edu/academic/forestry_wildlife/fire/smoke_guide/smoke_dispersion.htm - switch (m_ownertype) - { - case owner_type::vehicle: + if (m_ownertype == owner_type::vehicle) { Particle.velocity.y += static_cast(( 0.025 * Particle.velocity.y ) * std::min( 0.f, Global.AirTemperature - 90 ) * Timedelta); // decelerate faster in cold weather Particle.velocity.y -= static_cast(( (0.05 * (pow(m_owner.vehicle->GetVelocity()*1,0.4))) * Particle.velocity.y ) * Global.Overcast * Timedelta); // decelerate faster with high air humidity and/or precipitation - break; - } - default: + } + else { Particle.velocity.y += static_cast(( 0.005 * Particle.velocity.y ) * std::min( 0.f, Global.AirTemperature - 10 ) * Timedelta); // decelerate faster in cold weather Particle.velocity.y -= static_cast(( 0.050 * Particle.velocity.y ) * Global.Overcast * Timedelta); // decelerate faster with high air humidity and/or precipitation Particle.velocity.y = std::max( static_cast(0.25 * ( 2.f - Global.Overcast )), Particle.velocity.y ); // put a cap on deceleration - break; - } - } + } Particle.position += Particle.velocity * static_cast( Timedelta ); Particle.position += 0.1f * Particle.age * simulation::Environment.wind() * static_cast( Timedelta ); diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 02c372e4..7faf2526 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -2062,18 +2062,13 @@ void TTrain::OnCommand_trainbrakebasepressureincrease(TTrain *Train, command_dat if (Command.action != GLFW_RELEASE) { - switch (Train->mvOccupied->BrakeHandle) - { - case TBrakeHandle::FV4a: + if (Train->mvOccupied->BrakeHandle == TBrakeHandle::FV4a) { Train->mvOccupied->BrakeCtrlPos2 = std::clamp(Train->mvOccupied->BrakeCtrlPos2 - 0.01, -1.5, 2.0); - break; } - default: + else { Train->mvOccupied->BrakeLevelAdd(0.01); - break; - } } } } @@ -2084,18 +2079,13 @@ void TTrain::OnCommand_trainbrakebasepressuredecrease(TTrain *Train, command_dat if (Command.action != GLFW_RELEASE) { - switch (Train->mvOccupied->BrakeHandle) - { - case TBrakeHandle::FV4a: + if (Train->mvOccupied->BrakeHandle == TBrakeHandle::FV4a) { Train->mvOccupied->BrakeCtrlPos2 = std::clamp(Train->mvOccupied->BrakeCtrlPos2 + 0.01, -1.5, 2.0); - break; } - default: + else { Train->mvOccupied->BrakeLevelAdd(-0.01); - break; - } } } }