Skip to content

Commit f69bce2

Browse files
committed
Automatic merge of T1.6-89-ga2a9bbcc8 and 13 pull requests
- Pull request #1156 at f46d5f2: Fix incorrectly disabled options in train operations window - Pull request #1086 at d8d61eb: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 492795a: Automatic speed control - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1124 at e241a0d: Built-in PBL2 brake controller - Pull request #1157 at 39cd994: Dynamic brake authorization by TCS - Pull request #1159 at 48c9a63: Skip OR warnings about TSRE-specific token Ruler - Pull request #1161 at 6cfe4e2: Fix string trim in .ini files - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1128 at 1d7643d: Particle Emitter Overhaul - Pull request #1160 at 3390e80: Route Based TTrack Sounds
15 parents 4c9ad64 + a2a9bbc + f46d5f2 + d8d61eb + 492795a + 270f22f + ba3c47f + 91d2d26 + e241a0d + 39cd994 + 48c9a63 + 6cfe4e2 + 5845a1a + 1d7643d + 3390e80 commit f69bce2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/CruiseControl.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ public void Initialize()
511511
else if (MaxForceSelectorController == null)
512512
{
513513
var notches = new List<MSTSNotch>();
514-
if (MaxForceSelectorIsDiscrete)
514+
if (MaxForceSelectorIsDiscrete && SpeedRegulatorMaxForceSteps > 0)
515515
{
516516
float numNotches = SpeedRegulatorMaxForceSteps;
517517
for (int i=DisableZeroForceStep ? 1 : 0; i<=numNotches; i++)
@@ -538,7 +538,7 @@ public void Initialize()
538538
else if (SpeedSelectorController == null)
539539
{
540540
var notches = new List<MSTSNotch>();
541-
if (SpeedSelectorIsDiscrete)
541+
if (SpeedSelectorIsDiscrete && SpeedRegulatorNominalSpeedStepMpS > 0)
542542
{
543543
if (!DisableZeroSelectedSpeedStep) notches.Add(new MSTSNotch(0, false, 0));
544544
if (MinimumSpeedForCCEffectMpS > 0) notches.Add(new MSTSNotch(float.Epsilon, false, 0));

0 commit comments

Comments
 (0)