heating power source fix, particle color support

2026-07-21 18:19:19 +02:00 · 2019-08-20 12:37:24 +02:00
parent 7e91a52646
commit 4dddf2dc45
5 changed files with 48 additions and 21 deletions
--- a/McZapkie/Mover.cpp
+++ b/McZapkie/Mover.cpp
@@ -1410,7 +1410,13 @@ void TMoverParameters::PowerCouplersCheck( double const Deltatime ) {
                break;
            }
            case TPowerSource::Main: {
-                localvoltage = ( true == Mains ? Voltage : 0.0 );
+                // HACK: main circuit can be fed through couplers, so we explicitly check pantograph supply here
+                localvoltage = (
+                    true == Mains ?
+                        std::max(
+                            PantFrontVolt,
+                            PantRearVolt ) :
+                        0.0 );
                break;
            }
            default: {