From 848f57d81784a856494914bdbc98761ed7fab1dd Mon Sep 17 00:00:00 2001 From: Hirek Date: Tue, 7 Jan 2025 14:59:12 +0100 Subject: [PATCH] Fix 4-step switch animation --- McZapkie/Mover.cpp | 2 +- Train.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 35211345..61b10aa4 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -9944,7 +9944,7 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) result = false; if (!modernContainOffPos) - modernDimmerState = 1; + modernDimmerState = 2; // jak nie ma opcji wylaczonej to niech sie odpali normalnie if (!enableModernDimmer) { modernDimmerState = 2; diff --git a/Train.cpp b/Train.cpp index e7a9b3b4..12a3089a 100644 --- a/Train.cpp +++ b/Train.cpp @@ -9683,9 +9683,10 @@ void TTrain::set_cab_controls( int const Cab ) { } if (ggModernLightDimSw.SubModel != nullptr) { - ggModernLightDimSw.PutValue( - mvOccupied->modernDimmerState - ); + if (mvOccupied->modernContainOffPos) + ggModernLightDimSw.PutValue(mvOccupied->modernDimmerState); + else + ggModernLightDimSw.PutValue(mvOccupied->modernDimmerState - 1); } // motor connectors