Skip to content

Commit 9246f8c

Browse files
committed
Automatic merge of T1.6-rc7-43-ge3d1d75f9 and 14 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2e06f85: Automatic speed control - Pull request #1104 at 87cdd9f: 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 #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1143 at 84f72b8: Status in Work Orders popup set too fast - Pull request #1151 at 5e59187: fix: Do not allow non-ACE/DDS textures in content - Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger - 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 - Pull request #1128 at 278d8ff: Particle Emitter Overhaul
16 parents dc93f3b + e3d1d75 + e10390b + 2e06f85 + 87cdd9f + 270f22f + ba3c47f + 91d2d26 + 8ae6bb7 + 84f72b8 + 5e59187 + 66dfd09 + 5845a1a + 689494b + fab5457 + 278d8ff commit 9246f8c

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

Source/Orts.Simulation/Simulation/Activity.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,9 @@ private Train matchesConsist(List<string> wagonIdList)
13771377
return null;
13781378
}
13791379
/// <summary>
1380-
/// Finds the train that contains exactly the wagons in the list. Exact order is not required.
1380+
/// Finds the train that contains the wagons in the list.
1381+
/// Exact order is not required.
1382+
/// Some lists may only contain the first and last wagon.
13811383
/// </summary>
13821384
/// <param name="wagonIdList"></param>
13831385
/// <returns>train or null</returns>
@@ -1392,10 +1394,10 @@ private Train matchesConsistNoOrder(List<string> wagonIdList)
13921394
{
13931395
nWagonListCars++;
13941396
}
1395-
}
1396-
if (nWagonListCars == trainItem.Cars.Count)
1397-
{
1398-
return trainItem;
1397+
if (nWagonListCars == trainItem.Cars.Count)
1398+
{
1399+
return trainItem;
1400+
}
13991401
}
14001402
}
14011403

0 commit comments

Comments
 (0)