Skip to content

Commit 4cbcc43

Browse files
committed
Automatic merge of T1.5.1-905-gaf8fb30c5 and 13 pull requests
- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at 9c456aa: Blueprint/train car operations UI window - Pull request #885 at 8f94333: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #903 at 9bead33: Downloading route content (Github, zip) - Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR - Pull request #916 at 4006f8a: Distributed Power Air Brake Synchronization - Pull request #919 at 7aafe02: Added mouse wheel support for controls which can be moved by pressing t… - Pull request #920 at a94e403: Update RailDriver in Manual
15 parents 5e73592 + af8fb30 + 3539862 + d00beb9 + f92de76 + 9c456aa + 8f94333 + 6c0785b + 1f5ba4c + 5866028 + 9bead33 + 6834af0 + 4006f8a + 7aafe02 + a94e403 commit 4cbcc43

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2786,7 +2786,7 @@ protected virtual void UpdateCompressor(float elapsedClockSeconds)
27862786
foreach (TrainCar locoCar in locoGroup)
27872787
{
27882788
if (locoCar is MSTSLocomotive loco)
2789-
syncCompressor |= (locoGroup.Contains(this as TrainCar) || CompressorIsMUControlled && loco.CompressorIsMUControlled)
2789+
syncCompressor |= (locoGroup.Contains(this as TrainCar) || (CompressorIsMUControlled && loco.CompressorIsMUControlled))
27902790
&& loco.CompressorIsOn && loco.MainResPressurePSI < loco.MaxMainResPressurePSI;
27912791

27922792
// No need to check repeatedly if we already know to sync compressors

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,9 +1263,9 @@ protected static void PropagateBrakeLinePressures(float elapsedClockSeconds, Tra
12631263
{
12641264
// Only sync application/release on DP units if both the lead unit AND the DP lead unit are set to synchronize
12651265
// Lead locomotive will always be allowed to apply/release
1266-
bool syncApplication = loco == lead || loco.DPSyncTrainApplication && lead.DPSyncTrainApplication;
1267-
bool syncRelease = loco == lead || loco.DPSyncTrainRelease && lead.DPSyncTrainRelease;
1268-
bool syncEmergency = loco == lead || loco.DPSyncEmergency && lead.DPSyncEmergency;
1266+
bool syncApplication = loco == lead || (loco.DPSyncTrainApplication && lead.DPSyncTrainApplication);
1267+
bool syncRelease = loco == lead || (loco.DPSyncTrainRelease && lead.DPSyncTrainRelease);
1268+
bool syncEmergency = loco == lead || (loco.DPSyncEmergency && lead.DPSyncEmergency);
12691269

12701270
tempBrakePipeFlow = 0.0f;
12711271

0 commit comments

Comments
 (0)