18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-19 18:05:01 +01:00

fix: the diesel throttle marker follows the controller only with a scaletable:

A mainctrlact: without a scaletable: (the shipped ST43 cabs) keeps its marker still, as before, instead of sweeping on an unchecked linear scale. A gauge redefined in the fixed form drops the scaletable: of its earlier definition.
This commit is contained in:
jerrrrycho
2026-11-08 17:45:01 +01:00
parent cf2092700e
commit dc4cc45769
5 changed files with 44 additions and 16 deletions

View File

@@ -21,8 +21,11 @@ inline bool follows_controller(TMoverParameters const &Vehicle) {
return (Vehicle.EngineType == TEngineType::DieselEngine || Vehicle.EngineType == TEngineType::DieselElectric) && Vehicle.EIMCtrlType == 0;
}
inline float position(TMoverParameters const &Vehicle) {
auto const controller{follows_controller(Vehicle)};
// Scaletable: the cab's gauge has a scaletable:. only such a marker follows the controller; the cabs that define
// mainctrlact: without one (the ST43 so far) keep their marker still, as before, instead of moving it on a scale
// nobody has checked
inline float position(TMoverParameters const &Vehicle, bool const Scaletable) {
auto const controller{Scaletable && follows_controller(Vehicle)};
auto const main{controller ? Vehicle.MainCtrlPos : Vehicle.MainCtrlActualPos};
auto const scnd{controller ? Vehicle.ScndCtrlPos : Vehicle.ScndCtrlActualPos};
return static_cast<float>(Vehicle.CoupledCtrl ? main + scnd : main);