Simplify condition for auto mode activation

cesarBLG · cesarBLG · commit 53fe3c28efb4 · 2025-06-06T10:36:00.000+02:00
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs
@@ -865,15 +865,14 @@ public void UpdateSpeedRegulatorModeChanges()
             }
             if (ForceRegulatorAutoWhenNonZeroSpeedSelectedAndThrottleAtZero)
             {
-                if (SelectedSpeedMpS > 0 && zeroThrottle && zeroDynamic &&
-                    zeroForce && DisableCruiseControlOnThrottleAndZeroForceAndZeroSpeed)
+                if (SelectedSpeedMpS > 0 && zeroThrottle && zeroDynamic && zeroForce)
                 {
                     SpeedRegMode = SpeedRegulatorMode.Auto;
                 }
             }
             if (ForceRegulatorAutoWhenNonZeroForceSelected)
             {
-                if (forceFromZero && DisableCruiseControlOnThrottleAndZeroForce && (zeroThrottle || UseThrottleAsForceSelector) && zeroDynamic)
+                if (forceFromZero && (zeroThrottle || UseThrottleAsForceSelector) && zeroDynamic)
                 {
                     SpeedRegMode = SpeedRegulatorMode.Auto;
                 }

Original file line number	Diff line number	Diff line change
`@@ -865,15 +865,14 @@ public void UpdateSpeedRegulatorModeChanges()`
`865`	`865`	`}`
`866`	`866`	`if (ForceRegulatorAutoWhenNonZeroSpeedSelectedAndThrottleAtZero)`
`867`	`867`	`{`
`868`		`- if (SelectedSpeedMpS > 0 && zeroThrottle && zeroDynamic &&`
`869`		`- zeroForce && DisableCruiseControlOnThrottleAndZeroForceAndZeroSpeed)`
	`868`	`+ if (SelectedSpeedMpS > 0 && zeroThrottle && zeroDynamic && zeroForce)`
`870`	`869`	`{`
`871`	`870`	`SpeedRegMode = SpeedRegulatorMode.Auto;`
`872`	`871`	`}`
`873`	`872`	`}`
`874`	`873`	`if (ForceRegulatorAutoWhenNonZeroForceSelected)`
`875`	`874`	`{`
`876`		`- if (forceFromZero && DisableCruiseControlOnThrottleAndZeroForce && (zeroThrottle \|\| UseThrottleAsForceSelector) && zeroDynamic)`
	`875`	`+ if (forceFromZero && (zeroThrottle \|\| UseThrottleAsForceSelector) && zeroDynamic)`
`877`	`876`	`{`
`878`	`877`	`SpeedRegMode = SpeedRegulatorMode.Auto;`
`879`	`878`	`}`