From 1f256e95932bcb5e0e824cf1fbf690a5b368d6dd Mon Sep 17 00:00:00 2001 From: jerrrrycho Date: Sat, 10 Oct 2026 15:18:45 +0200 Subject: [PATCH] refactor(sonar): mark unused parameters (cpp:S1172) Unused names are commented out; parameters used only on some platforms are marked [[maybe_unused]]. Co-Authored-By: Claude Opus 5.5 --- McZapkie/Mover.cpp | 24 ++-- McZapkie/Oerlikon_ESt.cpp | 6 +- McZapkie/hamulce.cpp | 8 +- application/driverhints.cpp | 182 +++++++++++++++---------------- application/uitranscripts.cpp | 2 +- audio/sound.cpp | 2 +- input/drivermouseinput.cpp | 4 +- input/messaging.cpp | 12 +- network/network.cpp | 2 +- scripting/pythonscreenviewer.cpp | 2 +- utilities/Logs.cpp | 4 +- vehicle/Train.cpp | 8 +- 12 files changed, 128 insertions(+), 128 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index f2de7e7e..65173284 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1483,7 +1483,7 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap // Oblicza przemieszczenie taboru - uproszczona wersja // ************************************************************************************************* -double TMoverParameters::FastComputeMovement(double dt, const TTrackShape &Shape, TTrackParam &Track, TLocation const &NewLoc, TRotation const &NewRot) +double TMoverParameters::FastComputeMovement(double dt, const TTrackShape & /*Shape*/, TTrackParam & /*Track*/, TLocation const &NewLoc, TRotation const &NewRot) { int b; // T_MoverParameters::FastComputeMovement(dt, Shape, Track, NewLoc, NewRot); @@ -1731,7 +1731,7 @@ void TMoverParameters::MainsCheck(double const Deltatime) } } -void TMoverParameters::LowVoltagePowerCheck(double const Deltatime) +void TMoverParameters::LowVoltagePowerCheck(double const /*Deltatime*/) { auto const lowvoltagepower{Power24vIsAvailable || Power110vIsAvailable}; @@ -1756,7 +1756,7 @@ void TMoverParameters::LowVoltagePowerCheck(double const Deltatime) } } -void TMoverParameters::PowerCouplersCheck(double const Deltatime, coupling const Coupling) +void TMoverParameters::PowerCouplersCheck(double const /*Deltatime*/, coupling const Coupling) { if (Coupling != coupling::highvoltage && Coupling != coupling::power110v && Coupling != coupling::power24v) { @@ -2086,7 +2086,7 @@ void TMoverParameters::ConverterCheck(double const Timestep) }; // heating system status check -void TMoverParameters::HeatingCheck(double const Timestep) +void TMoverParameters::HeatingCheck(double const /*Timestep*/) { // update heating devices @@ -2172,7 +2172,7 @@ void TMoverParameters::HeatingCheck(double const Timestep) } // water pump status check -void TMoverParameters::WaterPumpCheck(double const Timestep) +void TMoverParameters::WaterPumpCheck(double const /*Timestep*/) { // NOTE: breaker override with start type is sm42 specific hack, replace with ability to define the presence of the breaker WaterPump.is_active = true == (Power24vIsAvailable || Power110vIsAvailable) && true == WaterPump.breaker && false == WaterPump.is_disabled && @@ -2180,7 +2180,7 @@ void TMoverParameters::WaterPumpCheck(double const Timestep) } // water heater status check -void TMoverParameters::WaterHeaterCheck(double const Timestep) +void TMoverParameters::WaterHeaterCheck(double const /*Timestep*/) { WaterHeater.is_active = false == WaterHeater.is_damaged && true == (Power24vIsAvailable || Power110vIsAvailable) && true == WaterHeater.is_enabled && true == WaterHeater.breaker && @@ -2195,7 +2195,7 @@ void TMoverParameters::WaterHeaterCheck(double const Timestep) } // fuel pump status update -void TMoverParameters::FuelPumpCheck(double const Timestep) +void TMoverParameters::FuelPumpCheck(double const /*Timestep*/) { FuelPump.is_active = true == (Power24vIsAvailable || Power110vIsAvailable) && false == FuelPump.is_disabled && @@ -2294,7 +2294,7 @@ void TMoverParameters::MotorBlowersCheck(double const Timestep) } } -void TMoverParameters::PantographsCheck(double const Timestep) +void TMoverParameters::PantographsCheck(double const /*Timestep*/) { { @@ -2332,7 +2332,7 @@ void TMoverParameters::PantographsCheck(double const Timestep) } } -void TMoverParameters::LightsCheck(double const Timestep) +void TMoverParameters::LightsCheck(double const /*Timestep*/) { auto &light{CompartmentLights}; @@ -4848,7 +4848,7 @@ void TMoverParameters::UpdateScndPipePressure(double dt) // yB: 20190906 // Aktualizacja ciśnienia w hamulcu sprezynowym // ************************************************************************************************* -void TMoverParameters::UpdateSpringBrake(double dt) +void TMoverParameters::UpdateSpringBrake(double /*dt*/) { double BP = SpringBrake.PNBrakeConnection ? BrakePress : 0; double MSP = SpringBrake.ShuttOff ? 0 : SpringBrake.MaxSetPressure; @@ -5200,7 +5200,7 @@ double TMoverParameters::BrakeForceP(double press, double velocity) // Q: 20160713 // oblicza siłę na styku koła i szyny // ************************************************************************************************* -double TMoverParameters::BrakeForce(TTrackParam const &Track) +double TMoverParameters::BrakeForce(TTrackParam const & /*Track*/) { double K{0}; @@ -11776,7 +11776,7 @@ TEngineType TMoverParameters::LoadFIZ_EngineDecode(std::string const &Engine) // Q: 20160717 // ************************************************************************************************* -bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) +bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int /*Dir*/) { WriteLog("check locomotive parameters..."); int b; diff --git a/McZapkie/Oerlikon_ESt.cpp b/McZapkie/Oerlikon_ESt.cpp index 9559d305..6ea9ba7a 100644 --- a/McZapkie/Oerlikon_ESt.cpp +++ b/McZapkie/Oerlikon_ESt.cpp @@ -294,7 +294,7 @@ double TNESt3::GetPF( double const PP, double const dt, double const Vel ) // pr return dV - dV1; } -void TNESt3::EStParams( double const i_crc ) // parametry charakterystyczne dla ESt +void TNESt3::EStParams( double const /*i_crc*/ ) // parametry charakterystyczne dla ESt { } @@ -331,7 +331,7 @@ double TNESt3::GetCRP() // return Miedzypoj.P; } -void TNESt3::CheckState(double const BCP, double &dV1) // glowny przyrzad rozrzadczy +void TNESt3::CheckState(double const BCP, double & /*dV1*/) // glowny przyrzad rozrzadczy { double const BVP{ BrakeRes->P() }; //-> tu ma byc komora rozprezna double const VVP{ ValveRes->P() }; @@ -384,7 +384,7 @@ void TNESt3::CheckReleaser(double const dt) // odluzniacz } } -double TNESt3::CVs(double const BP) // napelniacz sterujacego +double TNESt3::CVs(double const /*BP*/) // napelniacz sterujacego { double const CVP{ CntrlRes->P() }; double const MPP{ Miedzypoj->P() }; diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index c0059a90..dca30aee 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -854,7 +854,7 @@ void TESt::CheckReleaser(double const dt) /// /// Brake cylinder (or impulse-chamber) pressure. /// In/out brake-pipe flow correction (unused in this base impl). -void TESt::CheckState(double const BCP, double &dV1) +void TESt::CheckState(double const BCP, double & /*dV1*/) { double const VVP{ValveRes->P()}; @@ -1086,7 +1086,7 @@ void TESt::Init(double const PP, double const HPP, double const LPP, double cons /// derived variants and currently a no-op. /// /// Characteristic value. -void TESt::EStParams(double const i_crc) {} +void TESt::EStParams(double const /*i_crc*/) {} /// Returns the control reservoir (ZS) pressure. double TESt::GetCRP() @@ -2502,7 +2502,7 @@ void TKE::CheckReleaser(double const dt) /// /// Cylinder (or impulse-chamber) pressure. /// In/out brake-pipe flow correction (unused here). -void TKE::CheckState(double const BCP, double &dV1) +void TKE::CheckState(double const BCP, double & /*dV1*/) { double VVP; double BVP; @@ -2604,7 +2604,7 @@ double TKE::CVs(double const BP) /// /// Impulse-chamber pressure. /// Opening coefficient. -double TKE::BVs(double const BCP) +double TKE::BVs(double const /*BCP*/) { double VVP; double BVP; diff --git a/application/driverhints.cpp b/application/driverhints.cpp index 4ed1f5ba..5ab56052 100644 --- a/application/driverhints.cpp +++ b/application/driverhints.cpp @@ -87,7 +87,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::batteryoff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->BatteryStart != start_t::manual || mvOccupied->Power24vIsAvailable == true; } ); break; } @@ -98,7 +98,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::batteryon ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->BatteryStart != start_t::manual || mvOccupied->Power24vIsAvailable == false; } ); break; } @@ -111,7 +111,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::cabdeactivation ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->AutomaticCabActivation || mvOccupied->IsCabMaster(); } ); break; } @@ -122,7 +122,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::cabactivation ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->AutomaticCabActivation || (mvOccupied->CabMaster == false && mvOccupied->CabActive == 0); } ); break; } @@ -134,7 +134,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::radiooff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->Radio == true; } ); break; } @@ -156,7 +156,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::radioon ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->Radio == false; } ); break; } @@ -168,7 +168,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::oilpumpoff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { auto const &device { mvOccupied->OilPump }; return device.start_type != start_t::manual || device.is_enabled == true || device.is_active == true || mvOccupied->Mains; } ); break; @@ -180,7 +180,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::oilpumpon ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { auto const &device { mvOccupied->OilPump }; return device.start_type != start_t::manual || (device.is_enabled == false && device.is_active == false); } ); break; @@ -193,7 +193,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::fuelpumpoff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { auto const &device { mvOccupied->FuelPump }; return device.start_type != start_t::manual || device.is_enabled == true || device.is_active == true; } ); break; @@ -205,7 +205,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::fuelpumpon ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { auto const &device { mvOccupied->FuelPump }; return device.start_type != start_t::manual || (device.is_enabled == false && device.is_active == false); } ); break; @@ -218,7 +218,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::pantographairsourcesetauxiliary ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvPantographUnit->bPantKurek3 == true; } ); break; } @@ -229,7 +229,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::pantographcompressoron ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvPantographUnit->bPantKurek3 == false; } ); break; } @@ -240,7 +240,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::pantographcompressoroff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvPantographUnit->PantCompFlag == true; } ); break; } @@ -251,7 +251,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::pantographcompressoron ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvPantographUnit->PantCompFlag == false; } ); break; } @@ -262,7 +262,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::pantographsvalveoff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvPantographUnit->PantsValve.is_active == true; } ); break; } @@ -285,7 +285,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::frontpantographvalveon ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvPantographUnit->Pantographs[end::front].valve.is_active == false; } ); break; } @@ -308,7 +308,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::rearpantographvalveon ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvPantographUnit->Pantographs[end::rear].valve.is_active == false; } ); break; } @@ -320,7 +320,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::converteroff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return IsAnyConverterEnabled == true; } ); break; } @@ -331,7 +331,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::converteron ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return IsAnyConverterExplicitlyEnabled == false; } ); break; } @@ -342,7 +342,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) } hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->ConverterOverloadRelayStart != start_t::manual || mvOccupied->ConvOvldFlag == false; } ); break; } @@ -352,7 +352,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) } hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->GroundRelayStart != start_t::manual || mvOccupied->GroundRelay == true; } ); break; } @@ -362,7 +362,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) } hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->FuseFlag == false; } ); break; } @@ -374,7 +374,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::linebreakeropen ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return IsAnyLineBreakerOpen == false; } ); break; } @@ -385,7 +385,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::linebreakerclose ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { // TBD, TODO: replace with consist-wide flag set true if any line breaker is closed? return mvControlling->Mains == false; } ); break; @@ -398,7 +398,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::compressoroff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return IsAnyCompressorEnabled == true; } ); break; } @@ -409,7 +409,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::compressoron ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return IsAnyCompressorExplicitlyEnabled == false; } ); break; } @@ -421,7 +421,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::frontmotorblowersoff ); hint( Action, - [this]( float const Parameter ) { + [this]( float const /*Parameter*/ ) { auto const &device { mvOccupied->MotorBlowers[ end::front ] }; return device.start_type != start_t::manual || (device.is_enabled == true && device.is_disabled == false); } ); break; @@ -434,7 +434,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::rearmotorblowersoff ); hint( Action, - [this]( float const Parameter ) { + [this]( float const /*Parameter*/ ) { auto const &device { mvOccupied->MotorBlowers[ end::rear ] }; return device.start_type != start_t::manual || (device.is_enabled == true && device.is_disabled == false); } ); break; @@ -447,7 +447,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::springbrakeoff ); hint( Action, - [this]( float const Parameter ) { + [this]( float const /*Parameter*/ ) { return mvOccupied->SpringBrake.Activate == true; } ); break; } @@ -458,7 +458,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::springbrakeon ); hint( Action, - [this]( float const Parameter ) { + [this]( float const /*Parameter*/ ) { return mvOccupied->SpringBrake.Activate == false; } ); break; } @@ -470,7 +470,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::manualbrakoff ); hint( Action, - [this]( float const Parameter ) { + [this]( float const /*Parameter*/ ) { return mvOccupied->LocalBrake != TLocalBrake::ManualBrake || mvOccupied->MBrake == false || mvOccupied->ManualBrakePos == ManualBrakePosNo; } ); break; } @@ -481,7 +481,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::manualbrakon ); hint( Action, - [this]( float const Parameter ) { + [this]( float const /*Parameter*/ ) { return mvOccupied->LocalBrake != TLocalBrake::ManualBrake || mvOccupied->MBrake == false || mvOccupied->ManualBrakePos == 0; } ); break; } @@ -496,7 +496,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_master_controller_hints(); hint( Action, - [this]( float const Parameter ) { + [this]( float const /*Parameter*/ ) { return mvControlling->RList[mvControlling->MainCtrlPos].Mn > 0; } ); break; } @@ -516,7 +516,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_master_controller_hints(); hint( Action, - [this]( float const Parameter ) { + [this]( float const /*Parameter*/ ) { return mvControlling->RList[mvControlling->MainCtrlPos].Bn < 2; } ); break; } @@ -527,7 +527,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_master_controller_hints(); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvControlling->IsMainCtrlNoPowerPos() && mvControlling->IsScndCtrlNoPowerPos(); } ); break; } @@ -541,7 +541,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_master_controller_hints(); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvControlling->EIMDirectionChangeAllow(); }, static_cast(mvControlling->MainCtrlMaxDirChangePos) ); break; @@ -575,7 +575,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) } hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return AccDesired <= EU07_AI_NOACCELERATION || (false == Ready && false == mvOccupied->ShuntMode) || AccDesired - AbsAccS <= 0.05 || (mvOccupied->EIMCtrlType > 0 ? mvControlling->eimic_real >= 1.0 : mvControlling->IsScndCtrlMaxPowerPos() && mvControlling->IsMainCtrlMaxPowerPos()); } ); break; @@ -589,7 +589,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_master_controller_hints(); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return std::abs(mvControlling->Ft) > 30.0 || (OrderCurrentGet() & Disconnect) == 0; } ); break; } @@ -601,7 +601,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_master_controller_hints(); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvControlling->IsScndCtrlNoPowerPos(); } ); break; } @@ -613,7 +613,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::waterpumpoff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { auto const &device { mvControlling->WaterPump }; return device.start_type != start_t::manual || (device.is_enabled == true && device.is_disabled == false) || device.is_active == true; } ); break; @@ -625,7 +625,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::waterpumpon ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { auto const &device { mvControlling->WaterPump }; return device.start_type != start_t::manual || (device.is_enabled == false && device.is_active == false); } ); break; @@ -637,7 +637,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::waterpumpbreakeroff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { auto const &device { mvControlling->WaterPump }; return device.breaker == true; } ); break; @@ -649,7 +649,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::waterpumpbreakeron ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { auto const &device { mvControlling->WaterPump }; return device.breaker == false; } ); break; @@ -661,7 +661,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::waterheateroff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { auto const &device { mvControlling->WaterHeater }; return device.is_enabled == true; } ); break; @@ -673,7 +673,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::waterheateron ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { auto const &device { mvControlling->WaterHeater }; return device.is_enabled == false; } ); break; @@ -685,7 +685,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::waterheaterbreakeroff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { auto const &device { mvControlling->WaterHeater }; return device.breaker == true; } ); break; @@ -697,7 +697,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::waterheaterbreakeron ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { auto const &device { mvControlling->WaterHeater }; return device.breaker == false; } ); break; @@ -709,7 +709,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::watercircuitslinkoff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvControlling->dizel_heat.auxiliary_water_circuit == false || mvControlling->WaterCircuitsLink == true; } ); break; } @@ -720,7 +720,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::watercircuitslinkon ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvControlling->dizel_heat.auxiliary_water_circuit == false || mvControlling->WaterCircuitsLink == false; } ); break; } @@ -728,7 +728,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) // NOTE: this action doesn't have AI component hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return false == IsHeatingTemperatureTooLow; } ); break; } @@ -736,7 +736,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) // NOTE: this action doesn't have AI component hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvControlling->ScndPipePress > 4.5 || mvControlling->VeselVolume == 0.0; } ); break; } @@ -744,7 +744,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) // NOTE: this action doesn't have AI component hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvPantographUnit->PantPress >= (is_emu() ? (mvPantographUnit->PantPressLockActive ? 4.6 : 2.6) : 4.2); } ); break; } @@ -752,7 +752,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) // NOTE: this action doesn't have AI component hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return ExchangeTime <= 0; } ); break; } @@ -760,7 +760,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) // NOTE: this action doesn't have AI component hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return IsAtPassengerStop == false; } ); break; } @@ -784,7 +784,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_train_brake_hints(); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->HandleUnlock == -3 || BrakeCtrlPosition == mvOccupied->HandleUnlock; } ); break; } @@ -796,7 +796,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_train_brake_hints(); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return is_equal(mvOccupied->fBrakeCtrlPos, mvOccupied->Handle->GetPos(bh_RP), 0.2) || (mvOccupied->Handle->Time && mvOccupied->Handle->GetCP() > mvOccupied->HighPipePress - 0.05); } ); // return ( BrakeCtrlPosition == gbh_RP ); } ); break; @@ -814,7 +814,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_train_brake_hints(); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return IsConsistBraked /*|| ( ( OrderCurrentGet() & Disconnect ) == 0 ) */; } ); break; } @@ -863,7 +863,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_train_brake_hints(); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return Ready && fReady < 0.4 && is_equal(mvOccupied->fBrakeCtrlPos, mvOccupied->Handle->GetPos(bh_RP), 0.2); } ); break; } @@ -901,7 +901,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::independentbrakeapply ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->LocalBrakePosA < 0.05; } ); break; } @@ -913,7 +913,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_reverser_hints(); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->DirActive * mvOccupied->CabActive > 0; } ); break; } @@ -924,7 +924,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_reverser_hints(); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->DirActive * mvOccupied->CabActive < 0; } ); break; } @@ -937,7 +937,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_reverser_hints(); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return iDirection == iDirectionOrder; } ); break; } @@ -948,7 +948,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_reverser_hints(); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->DirActive == 0; } ); break; } @@ -960,7 +960,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::sandingoff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvControlling->Sand == 0 || mvControlling->SandDose == true || mvControlling->SlippingWheels == false; } ); break; } @@ -971,7 +971,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::sandingon ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvControlling->Sand == 0 || mvControlling->SandDose == false; } ); break; } @@ -981,7 +981,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) } hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvControlling->ASBType != 1 || (mvControlling->Hamulec->GetBrakeStatus() & b_asb) != 0 || mvControlling->SlippingWheels == false; } ); break; } @@ -993,7 +993,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::hornoff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { // NOTE: we provide slightly larger horn activation window for human driver return fWarningDuration + 5.0 < 0.05 || mvOccupied->WarningSignal != 0; } ); break; @@ -1020,7 +1020,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) // TODO: remove other door lock hints hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->Doors.has_lock == false || mvOccupied->Doors.lock_enabled == true; } ); break; } @@ -1032,7 +1032,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::departuresignaloff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->Doors.has_warning == false || mvOccupied->Doors.has_autowarning == true || mvOccupied->DepartureSignal == true || mvOccupied->Vel > 5.0; } ); break; } @@ -1043,7 +1043,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::departuresignalon ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->Doors.has_warning == false || mvOccupied->Doors.has_autowarning == true || mvOccupied->DepartureSignal == false; } ); break; } @@ -1056,7 +1056,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::doorrightclose ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return IsAnyDoorOpen[side::right] == true; } ); break; } @@ -1068,7 +1068,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::doorrightopen ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return IsAnyDoorOpen[side::right] == false; } ); break; } @@ -1080,7 +1080,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::doorleftclose ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return IsAnyDoorOpen[side::left] == true; } ); break; } @@ -1092,7 +1092,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::doorleftopen ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return IsAnyDoorOpen[side::left] == false; } ); break; } @@ -1103,7 +1103,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::doorrightpermitoff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return IsAnyDoorPermitActive[side::right] == true; } ); break; } @@ -1114,7 +1114,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::doorrightpermiton ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return IsAnyDoorPermitActive[side::right] == false; } ); break; } @@ -1125,7 +1125,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::doorleftpermitoff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return IsAnyDoorPermitActive[side::left] == true; } ); break; } @@ -1136,7 +1136,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::doorleftpermiton ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return IsAnyDoorPermitActive[side::left] == false; } ); break; } @@ -1149,7 +1149,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::consistlightsoff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { auto const &device { mvOccupied->CompartmentLights }; return Global.fLuminance * ConsistShade > 0.40 || device.start_type != start_t::manual || (device.is_enabled == true && device.is_disabled == false) || device.is_active == true; } ); break; @@ -1162,7 +1162,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::consistlightson ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { auto const &device { mvOccupied->CompartmentLights }; return Global.fLuminance * ConsistShade < 0.35 || device.start_type != start_t::manual || (device.is_enabled == false && device.is_active == false); } ); break; @@ -1175,7 +1175,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::consistheatingoff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->HeatingAllow == true; } ); break; } @@ -1186,7 +1186,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::consistheatingon ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return mvOccupied->HeatingAllow == false; } ); break; } @@ -1198,7 +1198,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) } hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return !mvOccupied->SecuritySystem.is_vigilance_blinking(); } ); break; } @@ -1209,7 +1209,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) } hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return !mvOccupied->SecuritySystem.is_cabsignal_blinking(); } ); break; } @@ -1246,7 +1246,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::lightsoff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return pVehicles[end::front]->has_signal_pc1_on(); } ); break; } @@ -1259,7 +1259,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::lightsoff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return pVehicles[end::front]->has_signal_pc2_on(); } ); break; } @@ -1276,7 +1276,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::lightsoff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { auto const activeend { mvOccupied->CabActive >= 0 ? end::front : end::rear }; auto const consistfront { mvOccupied->DirActive >= 0 ? end::front : end::rear }; return pVehicles[consistfront]->has_signal_on(activeend, light::headlight_right) && pVehicles[1 - consistfront]->has_signal_on(1 - activeend, light::headlight_left); } ); @@ -1291,7 +1291,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::lightsoff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return pVehicles[end::rear]->has_signal_pc5_on(); } ); break; } @@ -1305,7 +1305,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::headcodetb1 ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { auto const activeend { mvOccupied->CabActive >= 0 ? end::front : end::rear }; auto const consistfront { mvOccupied->DirActive >= 0 ? end::front : end::rear }; return pVehicles[consistfront]->has_signal_on(activeend, 0) && pVehicles[1 - consistfront]->has_signal_on(1 - activeend, 0); } ); @@ -1319,7 +1319,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::releaseroff ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return true == mvOccupied->Hamulec->Releaser(); } ); break; } @@ -1330,7 +1330,7 @@ TController::cue_action( driver_hint const Action, float const Actionparameter ) remove_hint( driver_hint::releaseron ); hint( Action, - [this](float const Parameter) { + [this](float const /*Parameter*/) { return false == mvOccupied->Hamulec->Releaser(); } ); break; } diff --git a/application/uitranscripts.cpp b/application/uitranscripts.cpp index 0655f9fe..5a65ff68 100644 --- a/application/uitranscripts.cpp +++ b/application/uitranscripts.cpp @@ -34,7 +34,7 @@ TTranscripts::AddLine( std::string const &txt, float show, float hide, bool it ) // dodanie tekstów, długość dźwięku, czy istotne void -TTranscripts::Add( std::string const &txt, bool backgorund ) { +TTranscripts::Add( std::string const &txt, bool /*backgorund*/ ) { if( true == txt.empty() ) { return; } diff --git a/audio/sound.cpp b/audio/sound.cpp index f27fcfe5..9f3ff912 100644 --- a/audio/sound.cpp +++ b/audio/sound.cpp @@ -867,7 +867,7 @@ sound_source::empty() const { // returns true if the source is emitting any sound bool -sound_source::is_playing( bool const Includesoundends ) const { +sound_source::is_playing( bool const /*Includesoundends*/ ) const { auto isplaying { sound(sound_id::begin).playing > 0 || sound(sound_id::main).playing > 0 }; if( false == isplaying diff --git a/input/drivermouseinput.cpp b/input/drivermouseinput.cpp index 2d5f3d24..874c96a7 100644 --- a/input/drivermouseinput.cpp +++ b/input/drivermouseinput.cpp @@ -133,7 +133,7 @@ mouse_slider::release() { } void -mouse_slider::on_move( double const Mousex, double const Mousey ) { +mouse_slider::on_move( double const /*Mousex*/, double const Mousey ) { auto const controlsize { Global.window_size.y * EU07_CONTROLLER_MOUSESLIDERSIZE }; auto const controledge { Global.window_size.y * 0.5 + controlsize * 0.5 }; @@ -276,7 +276,7 @@ drivermouse_input::move( double Mousex, double Mousey ) { } void -drivermouse_input::scroll( double const Xoffset, double const Yoffset ) { +drivermouse_input::scroll( double const /*Xoffset*/, double const Yoffset ) { if( Global.ctrlState ) { // ctrl + scroll wheel adjusts fov diff --git a/input/messaging.cpp b/input/messaging.cpp index d73a6d32..cea08f1b 100644 --- a/input/messaging.cpp +++ b/input/messaging.cpp @@ -32,7 +32,7 @@ namespace multiplayer { std::uint32_t const EU07_MESSAGEHEADER { MAKE_ID4( 'E','U','0','7' ) }; void -Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam) { +Navigate([[maybe_unused]] std::string const &ClassName, [[maybe_unused]] UINT Msg, [[maybe_unused]] WPARAM wParam, [[maybe_unused]] LPARAM lParam) { #ifdef _WIN32 // wysłanie komunikatu do sterującego HWND h = FindWindow(ClassName.c_str(), 0); // można by to zapamiętać @@ -198,7 +198,7 @@ OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) } void -WyslijEvent(const std::string &e, const std::string &d) +WyslijEvent([[maybe_unused]] const std::string &e, [[maybe_unused]] const std::string &d) { // Ra: jeszcze do wyczyszczenia #ifdef _WIN32 DaneRozkaz r; @@ -219,7 +219,7 @@ WyslijEvent(const std::string &e, const std::string &d) } void -WyslijUszkodzenia(const std::string &t, char fl) +WyslijUszkodzenia([[maybe_unused]] const std::string &t, [[maybe_unused]] char fl) { // wysłanie informacji w postaci pojedynczego tekstu #ifdef _WIN32 DaneRozkaz r; @@ -239,7 +239,7 @@ WyslijUszkodzenia(const std::string &t, char fl) } void -WyslijString(const std::string &t, int n) +WyslijString([[maybe_unused]] const std::string &t, [[maybe_unused]] int n) { // wysłanie informacji w postaci pojedynczego tekstu #ifdef _WIN32 DaneRozkaz r; @@ -264,7 +264,7 @@ WyslijWolny(const std::string &t) } void -WyslijNamiary(TDynamicObject const *Vehicle) +WyslijNamiary([[maybe_unused]] TDynamicObject const *Vehicle) { // wysłanie informacji o pojeździe - (float), długość ramki będzie zwiększana w miarę potrzeby #ifdef _WIN32 DaneRozkaz r; @@ -395,7 +395,7 @@ WyslijObsadzone() } void -WyslijParam(int nr, int fl) +WyslijParam([[maybe_unused]] int nr, [[maybe_unused]] int fl) { // wysłanie parametrów symulacji w ramce (nr) z flagami (fl) #ifdef _WIN32 DaneRozkaz r; diff --git a/network/network.cpp b/network/network.cpp index cc3e3a9d..3125c5a5 100644 --- a/network/network.cpp +++ b/network/network.cpp @@ -79,7 +79,7 @@ void network::connection::catch_up() send_messages(messages); } -void network::connection::send_complete(std::shared_ptr buf) +void network::connection::send_complete(std::shared_ptr /*buf*/) { if (!is_client && state == CATCHING_UP) { catch_up(); diff --git a/scripting/pythonscreenviewer.cpp b/scripting/pythonscreenviewer.cpp index 78380293..f2aed041 100644 --- a/scripting/pythonscreenviewer.cpp +++ b/scripting/pythonscreenviewer.cpp @@ -17,7 +17,7 @@ void texture_window_fb_resize(GLFWwindow *win, int w, int h) texwindow->notify_window_fb_size(win, w, h); } -void texture_window_mouse_button(GLFWwindow *win, int button, int action, int mods) +void texture_window_mouse_button(GLFWwindow *win, int button, int action, int /*mods*/) { python_screen_viewer *texwindow = (python_screen_viewer*)glfwGetWindowUserPointer(win); texwindow->notify_click(win, button, action); diff --git a/utilities/Logs.cpp b/utilities/Logs.cpp index 65fae196..005e7f8e 100644 --- a/utilities/Logs.cpp +++ b/utilities/Logs.cpp @@ -206,14 +206,14 @@ void ErrorLog(const char* str, logtype type) } -void Error(const std::string &asMessage, bool box) +void Error(const std::string &asMessage, bool /*box*/) { // if (box) // MessageBox(NULL, asMessage.c_str(), string("EU07 " + Global.asRelease).c_str(), MB_OK); ErrorLog(asMessage.c_str()); } -void Error(const char *&asMessage, bool box) +void Error(const char *&asMessage, bool /*box*/) { // if (box) // MessageBox(NULL, asMessage, string("EU07 " + Global.asRelease).c_str(), MB_OK); diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 1de804c0..08839cd5 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -6072,7 +6072,7 @@ void TTrain::OnCommand_redmarkerdisablerearright(TTrain *Train, command_data con } } -void TTrain::OnCommand_redmarkerstoggle(TTrain *Train, command_data const &Command) +void TTrain::OnCommand_redmarkerstoggle(TTrain * /*Train*/, command_data const &Command) { if (true == Command.freefly && Command.action == GLFW_PRESS) @@ -6098,7 +6098,7 @@ void TTrain::OnCommand_redmarkerstoggle(TTrain *Train, command_data const &Comma } } -void TTrain::OnCommand_endsignalstoggle(TTrain *Train, command_data const &Command) +void TTrain::OnCommand_endsignalstoggle(TTrain * /*Train*/, command_data const &Command) { if (true == Command.freefly && Command.action == GLFW_PRESS) @@ -7793,7 +7793,7 @@ void TTrain::OnCommand_nearestcarcouplingdisconnect(TTrain *Train, command_data } } -void TTrain::OnCommand_nearestcarcoupleradapterattach(TTrain *Train, command_data const &Command) +void TTrain::OnCommand_nearestcarcoupleradapterattach(TTrain * /*Train*/, command_data const &Command) { if (true == Command.freefly && Command.action == GLFW_PRESS) @@ -7812,7 +7812,7 @@ void TTrain::OnCommand_nearestcarcoupleradapterattach(TTrain *Train, command_dat } } -void TTrain::OnCommand_nearestcarcoupleradapterremove(TTrain *Train, command_data const &Command) +void TTrain::OnCommand_nearestcarcoupleradapterremove(TTrain * /*Train*/, command_data const &Command) { if (true == Command.freefly && Command.action == GLFW_PRESS)