Merge pull request #832 from cesarBLG/cc-train-priority

cesarBLG · web-flow · commit 1daa6a7c6b95 · 2023-05-24T16:21:24.000+02:00
Fix Cruise Control together with Train Brake
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs
@@ -506,7 +506,7 @@ public void Update(float elapsedClockSeconds)
                     trainBrakePercent = 0;
                 }
                 else if ((Locomotive.TrainBrakeController.MaxPressurePSI - Locomotive.BrakeSystem.BrakeLine1PressurePSI > 1 ||
-                    Locomotive.Train.BrakeLine4 > 0 && TrainBrakePriority) && !CCIsUsingTrainBrake)
+                    Locomotive.Train.BrakeLine4 > 0) && TrainBrakePriority && !CCIsUsingTrainBrake)
                 {
                     reducingForce = true;
                     timeFromEngineMoved = 0;

Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@ public void Update(float elapsedClockSeconds)`
`506`	`506`	`trainBrakePercent = 0;`
`507`	`507`	`}`
`508`	`508`	`else if ((Locomotive.TrainBrakeController.MaxPressurePSI - Locomotive.BrakeSystem.BrakeLine1PressurePSI > 1 \|\|`
`509`		`- Locomotive.Train.BrakeLine4 > 0 && TrainBrakePriority) && !CCIsUsingTrainBrake)`
	`509`	`+ Locomotive.Train.BrakeLine4 > 0) && TrainBrakePriority && !CCIsUsingTrainBrake)`
`510`	`510`	`{`
`511`	`511`	`reducingForce = true;`
`512`	`512`	`timeFromEngineMoved = 0;`