Skip to content

Commit 529e648

Browse files
committed
Automatic merge of T1.5.1-1099-g9196f6c2d2 and 19 pull requests
- Pull request #891 at 9a1d6b2: Auto save - Pull request #903 at 25cc886: Downloading route content (Github, zip) - Pull request #959 at 2452cb0: Fix TrackViewer crash on big zoom value - Pull request #972 at e90a2aa: On Map window color changed switch or signal is not changed - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #882 at 8f695a4: Blueprint/train car operations UI window - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes - Pull request #954 at 53e9cc6: Multiple Track Profiles & Superelevation Improvements - Pull request #962 at 46d0472: Fix pantographs on unpowered cars - Pull request #970 at 6fa5eed: feat: Remove unnecessary Windows.Forms usage - Pull request #973 at c35be87: fix: Using singular target framework to allow for different platforms across different projects - Pull request #974 at 5faea6f: Bug fix for https://bugs.launchpad.net/or/+bug/2076034 Doors remain open in AI trains - Pull request #977 at a30c659: adds cache for SD files - Pull request #978 at 91f3ee8: fix: adds MilepostUnitsMiles to Manual - Pull request #900 at c27f32d: DMI updates - Pull request #799 at dfc715e: Consolidated wind simulation - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #952 at 8347095: Investigation - Pulsing graphics
21 parents 4fb6d35 + 9196f6c + 9a1d6b2 + 25cc886 + 2452cb0 + e90a2aa + d00beb9 + 8f695a4 + 1f5ba4c + a519452 + 53e9cc6 + 46d0472 + 6fa5eed + c35be87 + 5faea6f + a30c659 + 91f3ee8 + c27f32d + dfc715e + f92de76 + 8347095 commit 529e648

File tree

1 file changed

+7
-7
lines changed
  • Source/Orts.Simulation/Simulation/Timetables

1 file changed

+7
-7
lines changed

Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4490,7 +4490,7 @@ public override void UpdateBrakingState(float elapsedClockSeconds, int presentTi
44904490
}
44914491
else if (nextActionInfo.NextAction == AIActionItem.AI_ACTION_TYPE.REVERSAL)
44924492
{
4493-
// Check if approaching reversal point
4493+
// Check if approaching reversal point
44944494
if (Math.Abs(SpeedMpS) < 0.05f)
44954495
{
44964496
SpeedMpS = 0;
@@ -13722,13 +13722,13 @@ public bool PerformDetach(TTTrain train, bool allowPlayerSelect)
1372213722
}
1372313723
else
1372413724
{
13725-
if (!ReverseDetachedTrain.HasValue)
13726-
{
13727-
ReverseDetachedTrain = GetDetachReversalInfo(train, newTrain);
13728-
}
13725+
if (!ReverseDetachedTrain.HasValue)
13726+
{
13727+
ReverseDetachedTrain = GetDetachReversalInfo(train, newTrain);
13728+
}
1372913729

13730-
bool newIsPlayer = newTrain.TrainType == Train.TRAINTYPE.INTENDED_PLAYER;
13731-
newTrain.LeadLocomotiveIndex = train.TTUncoupleBehind(newTrain, ReverseDetachedTrain.Value, -1, newIsPlayer);
13730+
bool newIsPlayer = newTrain.TrainType == Train.TRAINTYPE.INTENDED_PLAYER;
13731+
newTrain.LeadLocomotiveIndex = train.TTUncoupleBehind(newTrain, ReverseDetachedTrain.Value, -1, newIsPlayer);
1373213732

1373313733

1373413734
}

0 commit comments

Comments
 (0)