diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 05a80d44..d99160f3 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -350,7 +350,6 @@ double TMoverParameters::Current(double n, double U) Mn = RList[MainCtrlActualPos].Mn * RList[MainCtrlActualPos].Bn; if (RList[MainCtrlActualPos].Bn > 1) { - Bn = 1; R = CircuitRes; } } @@ -432,7 +431,6 @@ double TMoverParameters::Current(double n, double U) if (DynamicBrakeType == dbrake_switch && (BrakePress > 2.0 || PipePress < 3.6)) { Im = 0; - MotorCurrent = 0; // Im:=0; Itot = 0; } @@ -4556,7 +4554,6 @@ void TMoverParameters::UpdatePipePressure(double dt) // ulepszony hamulec bezp. EmergencyValveFlow = 0.0; - auto const lowvoltagepower{Power24vIsAvailable || Power110vIsAvailable}; // EngDmgFlag 32 (load destroyed) used to trigger this too; dropped, it has nothing to do with // the emergency brake (a broken coupler sets AlarmChainFlag instead) @@ -5903,7 +5900,6 @@ double TMoverParameters::TractionForce(double dt) auto power = Power; tempImax = DElist[MainCtrlPos].Imax; tempUmax = DElist[MainCtrlPos].Umax; - tempPmax = DElist[MainCtrlPos].GenPower; if (true == Heating) { power -= HeatingPower; @@ -6361,7 +6357,6 @@ double TMoverParameters::TractionForce(double dt) // (Hamulec as TLSt).SetLBP(LocBrakePress); tmp = 4; // szybkie malenie, powolne wzrastanie } - dmoment = eimv[eimv_Fful]; // NOTE: the commands to operate the sandbox are likely to conflict with other similar ai decisions // TODO: gather these in single place so they can be resolved together if (SlippingWheels) @@ -7988,7 +7983,6 @@ double TMoverParameters::dizel_Momentum(double dizel_fill, double n, double dt) friction = dizel_engagefriction; hydro_TC_nIn = enrot; // wal wejsciowy przetwornika momentu hydro_TC_nOut = dizel_n_old; // wal wyjsciowy przetwornika momentu - neps = (n - dizel_n_old) / dt; // przyspieszenie katowe walu wejsciowego skrzyni biegow if (enrot > 0) { @@ -8132,7 +8126,6 @@ double TMoverParameters::dizel_Momentum(double dizel_fill, double n, double dt) { dizel_engagedeltaomega = 0; gearMoment = Moment; - enMoment = 0; double enrot_min = enrot - (std::min(TorqueC, TorqueL + abs(hydro_TC_TorqueIn)) - Moment) / dizel_AIM * dt; double enrot_max = enrot + (std::min(TorqueC, TorqueL + abs(hydro_TC_TorqueIn)) + Moment) / dizel_AIM * dt; enrot = safe_clamp(n, enrot_min, enrot_max); @@ -9289,7 +9282,7 @@ bool TMoverParameters::readDMList(std::string const &line) WriteLog("Read DMList: arguments missing in line " + std::to_string(LISTLINE + 1)); return false; } - auto idx = LISTLINE++; + ++LISTLINE; double x = 0.0; double y = 0.0; parser >> x >> y; @@ -9309,7 +9302,7 @@ bool TMoverParameters::readV2NMAXList(std::string const &line) WriteLog("Read V2nmaxList: arguments missing in line " + std::to_string(LISTLINE + 1)); return false; } - auto idx = LISTLINE++; + ++LISTLINE; double x = 0.0; double y = 0.0; parser >> x >> y; @@ -9329,7 +9322,7 @@ bool TMoverParameters::readHTCList(std::string const &line) WriteLog("Read HTCList: arguments missing in line " + std::to_string(LISTLINE + 1)); return false; } - auto idx = LISTLINE++; + ++LISTLINE; double x = 0.0; double y = 0.0; parser >> x >> y; @@ -9349,7 +9342,7 @@ bool TMoverParameters::readPmaxList(std::string const &line) WriteLog("Read PmaxList: arguments missing in line " + std::to_string(LISTLINE + 1)); return false; } - auto idx = LISTLINE++; + ++LISTLINE; double x = 0.0; double y = 0.0; parser >> x >> y; @@ -9426,7 +9419,7 @@ bool TMoverParameters::readDimmerList(std::string const &line) WriteLog("Read DimmerList: arguments missing in line " + std::to_string(LISTLINE + 1)); return false; } - int idx = LISTLINE++; + ++LISTLINE; dimPosition dps; parser >> dps.isHighBeam >> dps.isDimmed >> dps.isOff; diff --git a/McZapkie/Oerlikon_ESt.cpp b/McZapkie/Oerlikon_ESt.cpp index 8c0cbb3c..78f50832 100644 --- a/McZapkie/Oerlikon_ESt.cpp +++ b/McZapkie/Oerlikon_ESt.cpp @@ -334,7 +334,6 @@ double TNESt3::GetCRP() 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() }; double const CVP{ CntrlRes->P() }; double const MPP{ Miedzypoj->P() }; diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index 1230408a..ab196a39 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -707,7 +707,6 @@ double TWest::GetPF(double const PP, double const dt, double const Vel) temp = BVP * int(EPS > 0); dv = PF(temp, LBP, 0.0015) * dt * EPS * EPS * int(LBP * EPS < MaxBP * LoadC); LBP = LBP - dv; - dv = 0; // przeplyw ZP <-> silowniki if ((BrakeStatus & b_on) == b_on && (TareBP < 0.1 || BCP < MaxBP * LoadC)) @@ -783,7 +782,6 @@ void TWest::SetEPS(double const nEPS) { double BCP; - BCP = BrakeCyl->P(); if (nEPS > 0) DCV = true; else if (nEPS == 0 && EPS != 0) @@ -855,7 +853,6 @@ void TESt::CheckState(double const BCP, double & /*dV1*/) { double const VVP{ValveRes->P()}; - double const BVP{BrakeRes->P()}; double const CVP{CntrlRes->P()}; // sprawdzanie stanu @@ -997,11 +994,8 @@ double TESt::GetPF(double const PP, double const dt, double const Vel) double CVP; BVP = BrakeRes->P(); - VVP = ValveRes->P(); BCP = BrakeCyl->P(); - CVP = CntrlRes->P() - 0.0; - dv = 0; dV1 = 0; // sprawdzanie stanu @@ -1157,7 +1151,6 @@ double TEStEP2::GetPF(double const PP, double const dt, double const Vel) BCP = ImplsRes->P(); CVP = CntrlRes->P(); // 110115 - konsultacje warszawa1 - dv = 0; dV1 = 0; // odluzniacz @@ -1340,9 +1333,9 @@ void TEStEP1::SetEPS(double const nEPS) double TESt3::GetPF(double const PP, double const dt, double const Vel) { double BVP{BrakeRes->P()}; - double VVP{ValveRes->P()}; + double VVP; double BCP{BrakeCyl->P()}; - double CVP{CntrlRes->P() - 0.0}; + double CVP; double dv{0.0}; double dV1{0.0}; @@ -1417,11 +1410,8 @@ double TESt4R::GetPF(double const PP, double const dt, double const Vel) double CVP; BVP = BrakeRes->P(); - VVP = ValveRes->P(); BCP = ImplsRes->P(); - CVP = CntrlRes->P(); - dv = 0; dV1 = 0; // sprawdzanie stanu @@ -1540,11 +1530,9 @@ double TESt3AL2::GetPF(double const PP, double const dt, double const Vel) double CVP; BVP = BrakeRes->P(); - VVP = ValveRes->P(); BCP = ImplsRes->P(); CVP = CntrlRes->P() - 0.0; - dv = 0; dV1 = 0; // sprawdzanie stanu @@ -2239,11 +2227,9 @@ double TCV1::GetPF(double const PP, double const dt, double const Vel) double CVP; BVP = BrakeRes->P(); - VVP = std::min(ValveRes->P(), BVP + 0.05); BCP = BrakeCyl->P(); CVP = CntrlRes->P(); - dv = 0; dV1 = 0; // sprawdzanie stanu @@ -2398,11 +2384,9 @@ double TCV1L_TR::GetPF(double const PP, double const dt, double const Vel) double CVP; BVP = BrakeRes->P(); - VVP = std::min(ValveRes->P(), BVP + 0.05); BCP = ImplsRes->P(); CVP = CntrlRes->P(); - dv = 0; dV1 = 0; // sprawdzanie stanu @@ -2504,7 +2488,6 @@ void TKE::CheckState(double const BCP, double & /*dV1*/) double BVP; double CVP; - BVP = BrakeRes->P(); VVP = ValveRes->P(); CVP = CntrlRes->P(); @@ -2580,7 +2563,6 @@ double TKE::CVs(double const BP) const double BVP; double CVP; - BVP = BrakeRes->P(); CVP = CntrlRes->P(); VVP = ValveRes->P(); @@ -2647,7 +2629,6 @@ double TKE::GetPF(double const PP, double const dt, double const Vel) IMP = ImplsRes->P(); CVP = CntrlRes->P(); - dv = 0; dV1 = 0; // sprawdzanie stanu @@ -3032,7 +3013,6 @@ double TFV4aM::GetPF(double i_bcp, double PP, double HP, double dt, double ep) int const LBDelay{100}; double const xpM{0.3}; // mnoznik membrany komory pod - ep = PP / 2.0 * 1.5 + ep / 2.0 * 0.5; // SPKS!! for (int idx = 0; idx < 5; ++idx) { @@ -3275,7 +3255,6 @@ double TMHZ_EN57::GetPF(double i_bcp, double PP, double HP, double dt, double ep Sounds[idx] = 0; } - DP = 0; i_bcp = std::clamp(i_bcp, -0.999, 9.999); // na wszelki wypadek, zeby nie wyszlo poza zakres @@ -3482,7 +3461,6 @@ double TMHZ_K5P::GetPF(double i_bcp, double PP, double HP, double dt, double ep) Sounds[idx] = 0; } - DP = 0; i_bcp = std::clamp(i_bcp, -0.999, 2.999); // na wszelki wypadek, zeby nie wyszlo poza zakres @@ -3503,7 +3481,6 @@ double TMHZ_K5P::GetPF(double i_bcp, double PP, double HP, double dt, double ep) LimCP = 3.4; else // luzowanie LimCP = 5.0; - pom = CP; LimCP = std::min(LimCP, HP); // pozycja + czasowy lub zasilanie ActFlowSpeed = 4; @@ -3661,7 +3638,6 @@ double TMHZ_6P::GetPF(double i_bcp, double PP, double HP, double dt, double ep) Sounds[idx] = 0; } - DP = 0; i_bcp = std::clamp(i_bcp, -0.999, 3.999); // na wszelki wypadek, zeby nie wyszlo poza zakres @@ -3682,7 +3658,6 @@ double TMHZ_6P::GetPF(double i_bcp, double PP, double HP, double dt, double ep) LimCP = 3.4; else // luzowanie LimCP = 5.0; - pom = CP; LimCP = std::min(LimCP, HP); // pozycja + czasowy lub zasilanie ActFlowSpeed = 4; diff --git a/environment/moon.cpp b/environment/moon.cpp index b4c8abcf..4f9b6123 100644 --- a/environment/moon.cpp +++ b/environment/moon.cpp @@ -179,10 +179,8 @@ void cMoon::move() { double const pertvariation = +0.658 * std::sin( degtorad * ( 2.0 * mnelong ) ); // Variation double const pertyearlyeqt = -0.186 * std::sin( degtorad * sunmnanom ); // Yearly equation // latitude perturbations - double const pertlat = -0.173 * std::sin( degtorad * ( arglat - 2.0 * mnelong ) ); m_body.eclong += pertevection + pertvariation + pertyearlyeqt; - ecliplat += pertlat; // declination m_body.declin = radtodeg * std::asin( std::sin (m_body.oblecl * degtorad) * std::sin(m_body.eclong * degtorad) ); diff --git a/input/drivermouseinput.cpp b/input/drivermouseinput.cpp index 75e5e35e..40bf969d 100644 --- a/input/drivermouseinput.cpp +++ b/input/drivermouseinput.cpp @@ -61,7 +61,6 @@ mouse_slider::bind( user_command const &Command ) { vehicle->MainCtrlPosNo + vehicle->ScndCtrlPosNo : vehicle->MainCtrlPosNo ) }; // for simplicity upper half of the range controls power, lower controls brakes - auto const brakerangemultiplier { powerrange / LocalBrakePosNo }; m_valuerange = 1.0; m_value = diff --git a/scripting/ladderlogic.cpp b/scripting/ladderlogic.cpp index 388fa12e..9067e21c 100644 --- a/scripting/ladderlogic.cpp +++ b/scripting/ladderlogic.cpp @@ -315,7 +315,6 @@ basic_controller::run() -> int { break; } auto &target { element( operation.element ) }; - auto const initialstate { target.input() }; target.input() = m_accumulator.back(); // additional operations for advanced element types switch( (basic_element::type_e)target.data.index() ) { diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 55be682c..91d494a7 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -8207,7 +8207,6 @@ void TTrain::OnCommand_cabchangeforward(TTrain *Train, command_data const &Comma if (Command.action == GLFW_PRESS) { - auto const *owner{(Train->DynamicObject->ctOwner != nullptr ? Train->DynamicObject->ctOwner : Train->DynamicObject->Mechanik)}; if (auto const movedirection{1}; false == Train->CabChange(movedirection)) { auto const exitdirection{(movedirection > 0 ? end::front : end::rear)}; @@ -8237,7 +8236,6 @@ void TTrain::OnCommand_cabchangebackward(TTrain *Train, command_data const &Comm if (Command.action == GLFW_PRESS) { - auto const *owner{(Train->DynamicObject->ctOwner != nullptr ? Train->DynamicObject->ctOwner : Train->DynamicObject->Mechanik)}; if (auto const movedirection{-1}; false == Train->CabChange(movedirection)) { // current vehicle doesn't extend any farther in this direction, check if we there's one connected we can move to @@ -10312,7 +10310,6 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) rsHuntingNoise->m_frequencyfactor /= static_cast(1 + mvOccupied->Vmax); } } - auto const nullvector{glm::vec3()}; std::vector>> sounds = { dsbReverserKey, dsbNastawnikJazdy, dsbNastawnikBocz, dsbSwitch, dsbPneumaticSwitch, rsHiss, rsHissU, rsHissE, rsHissX, rsHissT, rsSBHiss, rsSBHissU, rsFadeSound, rsRunningNoise, rsResonanceNoise, rsWindSound, rsHuntingNoise, dsbHasler, dsbBuzzer, dsbBuzzerShp, dsbSlipAlarm, m_distancecounterclear, diff --git a/world/mtable.cpp b/world/mtable.cpp index d2b7975b..896454fd 100644 --- a/world/mtable.cpp +++ b/world/mtable.cpp @@ -262,7 +262,6 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) } else { - ConversionError = 666; vActual = -1; s = scnpath + TrainName + ".txt"; replace_slashes(s);