File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed
Source/Orts.Simulation/Simulation/RollingStocks/SubSystems Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -75,7 +75,7 @@ public float SelectedSpeedMpS
7575 {
7676 if ( UseThrottleAsSpeedSelector && SpeedRegMode != SpeedRegulatorMode . Auto ) return ;
7777 float val = 0 ;
78- if ( value >= MinimumSpeedForCCEffectMpS )
78+ if ( value >= MinimumSpeedForCCEffectMpS && value > 0 )
7979 {
8080 float min = MinimumSpeedForCCEffectMpS ;
8181 float max = Locomotive . MaxSpeedMpS ;
@@ -840,14 +840,14 @@ public void UpdateSpeedRegulatorModeChanges()
840840 }
841841 if ( DisableCruiseControlOnThrottleAndZeroForce )
842842 {
843- if ( ( throttleFromZero || UseThrottleAsForceSelector ) && zeroForce )
843+ if ( throttleFromZero && ( zeroForce || UseThrottleAsForceSelector ) )
844844 {
845845 SpeedRegMode = SpeedRegulatorMode . Manual ;
846846 }
847847 }
848848 if ( DisableCruiseControlOnThrottleAndZeroForceAndZeroSpeed )
849849 {
850- if ( ( throttleFromZero || UseThrottleAsForceSelector ) && zeroForce && zeroSelectedSpeed )
850+ if ( throttleFromZero && ( zeroForce || UseThrottleAsForceSelector ) && zeroSelectedSpeed )
851851 {
852852 SpeedRegMode = SpeedRegulatorMode . Manual ;
853853 }
@@ -872,7 +872,7 @@ public void UpdateSpeedRegulatorModeChanges()
872872 }
873873 if ( ForceRegulatorAutoWhenNonZeroForceSelected )
874874 {
875- if ( forceFromZero && ( zeroThrottle || UseThrottleAsForceSelector ) && zeroDynamic )
875+ if ( forceFromZero && DisableCruiseControlOnThrottleAndZeroForce && ( zeroThrottle || UseThrottleAsForceSelector ) && zeroDynamic )
876876 {
877877 SpeedRegMode = SpeedRegulatorMode . Auto ;
878878 }
You can’t perform that action at this time.
0 commit comments