Skip to content

Commit 2ea670a

Browse files
committed
Automatic merge of T1.6-rc4-32-g196d83e86 and 15 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at aa72c13: Automatic speed control - Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception - 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 #1126 at 3bb081e: ShapeHierarchy Attachment for More Wagon Addons - Pull request #1130 at 251a677: Fix F9 points to an incorrect car ID. - Pull request #1132 at 934d29e: Fixes For Correct Questionable Braking Parameters - Pull request #1133 at 8dc00d5: Minor Fix for Brake Pipe Charging - Pull request #1136 at 6f1b82f: Fix Curve Resistance Calculation - Pull request #1137 at c2c9e2a: Apply brakes at startup on minimal reduction - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller
17 parents 415933b + 196d83e + e10390b + aa72c13 + 387388e + 270f22f + ba3c47f + 91d2d26 + 3bb081e + 251a677 + 934d29e + 8dc00d5 + 6f1b82f + c2c9e2a + 5845a1a + 689494b + fab5457 commit 2ea670a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,7 @@ public void SpeedRegulatorMaxForceStartToZero(float? target)
10461046
return;
10471047

10481048
MaxForceSelectorController.StartDecrease(target, true);
1049-
if (MaxForceSelectorController.NotchCount() <= 0) Locomotive.SignalEvent(Common.Event.CruiseControlMaxForce);
1049+
if (MaxForceSelectorController.NotchCount() <= 1) Locomotive.SignalEvent(Common.Event.CruiseControlMaxForce);
10501050
}
10511051
public void SpeedRegulatorMaxForceChangeByMouse(float value)
10521052
{
@@ -1198,7 +1198,7 @@ public void SpeedSelectorIncreaseStep()
11981198
if (time >= selectedSpeedLeverHoldTime && time < selectedSpeedLeverHoldTime + SpeedSelectorStepTimeSeconds) return;
11991199
selectedSpeedLeverHoldTime = time;
12001200

1201-
if (SpeedSelectorController.NotchCount() > 0)
1201+
if (SpeedSelectorController.NotchCount() > 1)
12021202
{
12031203
SpeedSelectorController.StartIncrease();
12041204
SpeedSelectorController.StopIncrease();
@@ -1222,7 +1222,7 @@ public void SpeedSelectorDecreaseStep()
12221222
selectedSpeedLeverHoldTime = time;
12231223

12241224
float speed = ControllerValueToSelectedSpeedMpS(SpeedSelectorController.CurrentValue) - SpeedRegulatorNominalSpeedStepMpS;
1225-
if (SpeedSelectorController.NotchCount() > 0)
1225+
if (SpeedSelectorController.NotchCount() > 1)
12261226
{
12271227
SpeedSelectorController.StartDecrease();
12281228
SpeedSelectorController.StopDecrease();

0 commit comments

Comments
 (0)