Skip to content

Commit 110e0d4

Browse files
committed
Automatic merge of T1.6-rc3-30-gdf7bf1a26 and 14 pull requests
- Pull request #1104 at 1f7af77: Handle simple adhesion within the axle module - Pull request #1057 at 1c2bcb4: Switchable brake system - Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 7fc8de1: 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 #1121 at 91d2d26: Manually Override Articulation - Pull request #1123 at dc286f5: Handle null control active locomotive - Pull request #1125 at 7a4f055: Lift #1096 into 1.6 release - Pull request #1129 at 034b6e2: adds missing es.po files - Pull request #1130 at 251a677: Fix F9 points to an incorrect car ID. - 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
16 parents 37bc073 + df7bf1a + 1f7af77 + 1c2bcb4 + e10390b + 7fc8de1 + 387388e + 270f22f + 91d2d26 + dc286f5 + 7a4f055 + 034b6e2 + 251a677 + 5845a1a + 689494b + fab5457 commit 110e0d4

File tree

5 files changed

+200
-220
lines changed

5 files changed

+200
-220
lines changed

Source/Orts.Simulation/Simulation/Simulator.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1839,14 +1839,15 @@ public void UncoupleBehind(TrainCar car, bool keepFront)
18391839
train.activityClearingDistanceM = train.Cars.Count < Train.standardTrainMinCarNo ? Train.shortClearingDistanceM : Train.standardClearingDistanceM;
18401840
train2.activityClearingDistanceM = train2.Cars.Count < Train.standardTrainMinCarNo ? Train.shortClearingDistanceM : Train.standardClearingDistanceM;
18411841

1842-
18431842
train.UncoupledFrom = train2;
18441843
train2.UncoupledFrom = train;
18451844

18461845
train2.SpeedMpS = train.SpeedMpS;
18471846

1847+
train.Cars[0].BrakeSystem.FrontBrakeHoseConnected = false;
18481848
train.Cars[train.Cars.Count - 1].BrakeSystem.RearBrakeHoseConnected = false;
18491849
train2.Cars[0].BrakeSystem.FrontBrakeHoseConnected = false;
1850+
train2.Cars[train2.Cars.Count - 1].BrakeSystem.RearBrakeHoseConnected = false;
18501851

18511852
train2.AITrainDirectionForward = train.AITrainDirectionForward;
18521853

-8.52 KB
Loading

0 commit comments

Comments
 (0)