Skip to content

Commit 45270e2

Browse files
committed
Automatic merge of T1.6-rc2-41-gacd714487 and 9 pull requests
- Pull request #1104 at 03ccdc6: 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 #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification
11 parents c989cd6 + acd7144 + 03ccdc6 + e10390b + 2391bc0 + 387388e + 9a4a873 + 270f22f + 721d118 + 5845a1a + 689494b commit 45270e2

File tree

1 file changed

+0
-15
lines changed
  • Source/Orts.Simulation/Simulation/Physics

1 file changed

+0
-15
lines changed

Source/Orts.Simulation/Simulation/Physics/Train.cs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1628,7 +1628,6 @@ public void DPMoveToFront()
16281628
if (LeadLocomotive == null || (LeadLocomotive as MSTSLocomotive).DPDynamicBrakeController == null)
16291629
return;
16301630
int idToMove = -1;
1631-
bool stillHasRemotes = false;
16321631
for (var i = 0; i < Cars.Count; i++)
16331632
{
16341633
if (!(Cars[i] is MSTSLocomotive))
@@ -1642,12 +1641,7 @@ public void DPMoveToFront()
16421641
Cars[i].RemoteControlGroup = 0;
16431642
else if (idToMove > -1 && Cars[i].RemoteControlGroup == 0)
16441643
Cars[i].RemoteControlGroup = 1;
1645-
1646-
if (Cars[i].RemoteControlGroup == 1)
1647-
stillHasRemotes = true;
16481644
}
1649-
if (!stillHasRemotes)
1650-
DPMode = 0;
16511645
}
16521646

16531647
/// <summary>
@@ -1662,7 +1656,6 @@ public void DPMoveToBack()
16621656
var dpDynamicBrakeCurrentNotch = MathHelper.Clamp((LeadLocomotive as MSTSLocomotive).DPDynamicBrakeController.GetNotch(dpDynamicBrakePercent/100), 0, 8);
16631657
var dpThrottleCurrentNotch = (LeadLocomotive as MSTSLocomotive).ThrottleController.CurrentNotch;
16641658
int idToMove = -1;
1665-
bool alreadyHasRemotes = false;
16661659
int idLead = LeadLocomotive != null ? (Cars[LeadLocomotiveIndex] as MSTSLocomotive).DPUnitID : -1;
16671660
for (var i = Cars.Count - 1; i >= 0; i--)
16681661
{
@@ -1674,7 +1667,6 @@ public void DPMoveToBack()
16741667
dpThrottlePercent = DPThrottlePercent;
16751668
dpDynamicBrakeCurrentNotch = (LeadLocomotive as MSTSLocomotive).DPDynamicBrakeController.CurrentNotch;
16761669
dpThrottleCurrentNotch = (LeadLocomotive as MSTSLocomotive).DPThrottleController.CurrentNotch;
1677-
alreadyHasRemotes = true;
16781670
continue;
16791671
}
16801672
if (idToMove == -1 && Cars[i].RemoteControlGroup == 0)
@@ -1694,13 +1686,6 @@ public void DPMoveToBack()
16941686
else if (idToMove > -1 && Cars[i].RemoteControlGroup == 1)
16951687
Cars[i].RemoteControlGroup = 0;
16961688
}
1697-
if (!alreadyHasRemotes)
1698-
{
1699-
if (LeadLocomotive.ThrottlePercent > 0)
1700-
DPMode = 1;
1701-
else if (LeadLocomotive.DynamicBrakePercent >= 0) // off is -1
1702-
DPMode = -1;
1703-
}
17041689
}
17051690

17061691
/// <summary>

0 commit comments

Comments
 (0)