Skip to content

Commit f321ada

Browse files
committed
Automatic merge of T1.6-rc8-59-g2eb7441b08 and 11 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 9b80fac: Automatic speed control - Pull request #1104 at ccc5c4d: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1124 at e241a0d: Built-in PBL2 brake controller - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1157 at 39cd994: Dynamic brake authorization by TCS - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1128 at 1d7643d: Particle Emitter Overhaul
13 parents a5eda3c + 2eb7441 + e10390b + 9b80fac + ccc5c4d + 270f22f + ba3c47f + 91d2d26 + e241a0d + 8ae6bb7 + 39cd994 + 5845a1a + 1d7643d commit f321ada

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Source/Orts.Simulation/Simulation/Activity.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1325,7 +1325,7 @@ override public Boolean Triggered(Activity activity)
13251325
}
13261326
break;
13271327
case EventType.DropOffWagonsAtLocation:
1328-
consistTrain = matchesConsistNoOrder(ChangeWagonIdList);
1328+
consistTrain = matchesConsistNoOrder(ChangeWagonIdList);
13291329
if (consistTrain != null)
13301330
{
13311331
if (consistTrain.TrainType == Train.TRAINTYPE.STATIC)
@@ -1394,16 +1394,16 @@ private Train matchesConsistNoOrder(List<string> wagonIdList)
13941394
foreach (var item in trainItem.Cars)
13951395
{
13961396
if (wagonIdList.Contains(item.CarID))
1397-
{
1397+
{
13981398
nWagonListCars++;
13991399
}
14001400
if (nWagonListCars == wagonIdList.Count)
14011401
{
14021402
return trainItem;
14031403
}
14041404
}
1405-
}
1406-
1405+
}
1406+
14071407
return null;
14081408
}
14091409
/// <summary>

0 commit comments

Comments
 (0)