You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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
Copy file name to clipboardExpand all lines: Source/Orts.Simulation/Simulation/Physics/Train.cs
-15Lines changed: 0 additions & 15 deletions
Original file line number
Diff line number
Diff line change
@@ -1628,7 +1628,6 @@ public void DPMoveToFront()
1628
1628
if (LeadLocomotive == null || (LeadLocomotive as MSTSLocomotive).DPDynamicBrakeController == null)
1629
1629
return;
1630
1630
int idToMove = -1;
1631
-
bool stillHasRemotes = false;
1632
1631
for (var i = 0; i < Cars.Count; i++)
1633
1632
{
1634
1633
if (!(Cars[i] is MSTSLocomotive))
@@ -1642,12 +1641,7 @@ public void DPMoveToFront()
1642
1641
Cars[i].RemoteControlGroup = 0;
1643
1642
else if (idToMove > -1 && Cars[i].RemoteControlGroup == 0)
1644
1643
Cars[i].RemoteControlGroup = 1;
1645
-
1646
-
if (Cars[i].RemoteControlGroup == 1)
1647
-
stillHasRemotes = true;
1648
1644
}
1649
-
if (!stillHasRemotes)
1650
-
DPMode = 0;
1651
1645
}
1652
1646
1653
1647
/// <summary>
@@ -1662,7 +1656,6 @@ public void DPMoveToBack()
1662
1656
var dpDynamicBrakeCurrentNotch = MathHelper.Clamp((LeadLocomotive as MSTSLocomotive).DPDynamicBrakeController.GetNotch(dpDynamicBrakePercent/100), 0, 8);
1663
1657
var dpThrottleCurrentNotch = (LeadLocomotive as MSTSLocomotive).ThrottleController.CurrentNotch;
1664
1658
int idToMove = -1;
1665
-
bool alreadyHasRemotes = false;
1666
1659
int idLead = LeadLocomotive != null ? (Cars[LeadLocomotiveIndex] as MSTSLocomotive).DPUnitID : -1;
1667
1660
for (var i = Cars.Count - 1; i >= 0; i--)
1668
1661
{
@@ -1674,7 +1667,6 @@ public void DPMoveToBack()
1674
1667
dpThrottlePercent = DPThrottlePercent;
1675
1668
dpDynamicBrakeCurrentNotch = (LeadLocomotive as MSTSLocomotive).DPDynamicBrakeController.CurrentNotch;
1676
1669
dpThrottleCurrentNotch = (LeadLocomotive as MSTSLocomotive).DPThrottleController.CurrentNotch;
1677
-
alreadyHasRemotes = true;
1678
1670
continue;
1679
1671
}
1680
1672
if (idToMove == -1 && Cars[i].RemoteControlGroup == 0)
@@ -1694,13 +1686,6 @@ public void DPMoveToBack()
1694
1686
else if (idToMove > -1 && Cars[i].RemoteControlGroup == 1)
1695
1687
Cars[i].RemoteControlGroup = 0;
1696
1688
}
1697
-
if (!alreadyHasRemotes)
1698
-
{
1699
-
if (LeadLocomotive.ThrottlePercent > 0)
1700
-
DPMode = 1;
1701
-
else if (LeadLocomotive.DynamicBrakePercent >= 0) // off is -1
0 commit comments