Merge pull request #636 from cesarBLG/fix-angle-cocks

cesarBLG · web-flow · commit 5b6d34554b16 · 2022-04-03T22:07:57.000+02:00
Remove venting of MRP because conflicts with EOT
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs
@@ -804,18 +804,10 @@ protected static void PropagateBrakeLinePressures(float elapsedClockSeconds, Tra
                         if (!car.BrakeSystem.FrontBrakeHoseConnected && car.BrakeSystem.AngleCockAOpen)
                         {
                             car.BrakeSystem.BrakeLine1PressurePSI = Math.Max(car.BrakeSystem.BrakeLine1PressurePSI * (1 - trainPipeTimeVariationS / brakePipeTimeFactorS), 0);
-                            if (car.BrakeSystem.TwoPipes)
-                            {
-                                car.BrakeSystem.BrakeLine2PressurePSI = Math.Max(car.BrakeSystem.BrakeLine2PressurePSI * (1 - trainPipeTimeVariationS / brakePipeTimeFactorS), 0);
-                            }
                         }
                         if ((nextCar == null || !nextCar.BrakeSystem.FrontBrakeHoseConnected) && car.BrakeSystem.AngleCockBOpen)
                         {
                             car.BrakeSystem.BrakeLine1PressurePSI = Math.Max(car.BrakeSystem.BrakeLine1PressurePSI * (1 - trainPipeTimeVariationS / brakePipeTimeFactorS), 0);
-                            if (car.BrakeSystem.TwoPipes)
-                            {
-                                car.BrakeSystem.BrakeLine2PressurePSI = Math.Max(car.BrakeSystem.BrakeLine2PressurePSI * (1 - trainPipeTimeVariationS / brakePipeTimeFactorS), 0);
-                            }
                         }
                     }
 #if DEBUG_TRAIN_PIPE_LEAK

Original file line number	Diff line number	Diff line change
`@@ -804,18 +804,10 @@ protected static void PropagateBrakeLinePressures(float elapsedClockSeconds, Tra`
`804`	`804`	`if (!car.BrakeSystem.FrontBrakeHoseConnected && car.BrakeSystem.AngleCockAOpen)`
`805`	`805`	`{`
`806`	`806`	`car.BrakeSystem.BrakeLine1PressurePSI = Math.Max(car.BrakeSystem.BrakeLine1PressurePSI * (1 - trainPipeTimeVariationS / brakePipeTimeFactorS), 0);`
`807`		`- if (car.BrakeSystem.TwoPipes)`
`808`		`- {`
`809`		`- car.BrakeSystem.BrakeLine2PressurePSI = Math.Max(car.BrakeSystem.BrakeLine2PressurePSI * (1 - trainPipeTimeVariationS / brakePipeTimeFactorS), 0);`
`810`		`- }`
`811`	`807`	`}`
`812`	`808`	`if ((nextCar == null \|\| !nextCar.BrakeSystem.FrontBrakeHoseConnected) && car.BrakeSystem.AngleCockBOpen)`
`813`	`809`	`{`
`814`	`810`	`car.BrakeSystem.BrakeLine1PressurePSI = Math.Max(car.BrakeSystem.BrakeLine1PressurePSI * (1 - trainPipeTimeVariationS / brakePipeTimeFactorS), 0);`
`815`		`- if (car.BrakeSystem.TwoPipes)`
`816`		`- {`
`817`		`- car.BrakeSystem.BrakeLine2PressurePSI = Math.Max(car.BrakeSystem.BrakeLine2PressurePSI * (1 - trainPipeTimeVariationS / brakePipeTimeFactorS), 0);`
`818`		`- }`
`819`	`811`	`}`
`820`	`812`	`}`
`821`	`813`	`#if DEBUG_TRAIN_PIPE_LEAK`