Skip to content

Commit 6f78429

Browse files
committed
Automatic merge of T1.6-rc2-41-gacd714487 and 10 pull requests
- Pull request #1104 at f15bb6b: Handle simple adhesion within the axle module - Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2391bc0: Automatic speed control - Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception - Pull request #1114 at 9a4a873: Fix color of DB in DrivingInfo when in setup with DPU fenced. (r1.6) - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1116 at 721d118: Fix Potential Hang in AnimatedPart.SetFrameWrap - Pull request #1118 at f1e0f35: Fix DPMode when last remote is moved to front. (r1.6) - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification
12 parents d127b81 + acd7144 + f15bb6b + e10390b + 2391bc0 + 387388e + 9a4a873 + 270f22f + 721d118 + f1e0f35 + 5845a1a + 689494b commit 6f78429

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2753,7 +2753,7 @@ protected virtual void UpdateTractiveForce(float elapsedClockSeconds)
27532753
}
27542754
else if (SlipControlSystem == SlipControlType.CutPower)
27552755
{
2756-
if (!DynamicBrake)
2756+
if (axle.DriveForceN != 0)
27572757
{
27582758
if (axle.HuDIsWheelSlip) SlipControlActive[i] = true;
27592759
}
@@ -2767,7 +2767,7 @@ protected virtual void UpdateTractiveForce(float elapsedClockSeconds)
27672767
}
27682768
else if (SlipControlSystem == SlipControlType.ReduceForce)
27692769
{
2770-
if (!DynamicBrake && axle.DriveForceN != 0 && AdvancedAdhesionModel)
2770+
if (axle.DriveForceN != 0 && (AdvancedAdhesionModel || !AntiSlip))
27712771
{
27722772
if (axle.SlipPercent > axle.SlipWarningTresholdPercent) SlipControlActive[i] = true;
27732773
}

0 commit comments

Comments
 (0)