Skip to content

Commit de571ca

Browse files
committed
Automatic merge of T1.5.1-870-ge0bf062eb and 18 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 #897 at 42f1dd9: feat: Improved system information collection - Pull request #903 at 9bead33: Downloading route content (Github, zip) - Pull request #907 at 9b0b04f: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel - Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR - Pull request #912 at 3112a51: New Triple Valve Features Vol. 2 - Pull request #914 at 8e50570: Adjustments to Duplex steam - Pull request #915 at 6d911d7: Correct calculation error with curve friction - Pull request #916 at 722037c: Distributed Power Air Brake Synchronization - Pull request #917 at fde18cf: Lighting Configuration Enhancements - Pull request #918 at f7ba507: Manual - News topics updated since 1.5.1
20 parents 25bbd5f + e0bf062 + 3539862 + d00beb9 + f92de76 + 9c456aa + 8f94333 + 6c0785b + 1f5ba4c + 5866028 + 42f1dd9 + 9bead33 + 9b0b04f + 6834af0 + 3112a51 + 8e50570 + 6d911d7 + 722037c + fde18cf + f7ba507 commit de571ca

File tree

1 file changed

+4
-4
lines changed
  • Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,9 +1471,9 @@ protected static void PropagateBrakeLinePressures(float elapsedClockSeconds, Tra
14711471
{
14721472
// Only sync application/release on DP units if both the lead unit AND the DP lead unit are set to synchronize
14731473
// Lead locomotive will always be allowed to apply/release
1474-
bool syncApplication = loco == lead ? true : loco.DPSyncTrainApplication && lead.DPSyncTrainApplication;
1475-
bool syncRelease = loco == lead ? true : loco.DPSyncTrainRelease && lead.DPSyncTrainRelease;
1476-
bool syncEmergency = loco == lead ? true : loco.DPSyncEmergency && lead.DPSyncEmergency;
1474+
bool syncApplication = loco == lead || loco.DPSyncTrainApplication && lead.DPSyncTrainApplication;
1475+
bool syncRelease = loco == lead || loco.DPSyncTrainRelease && lead.DPSyncTrainRelease;
1476+
bool syncEmergency = loco == lead || loco.DPSyncEmergency && lead.DPSyncEmergency;
14771477

14781478
tempBrakePipeFlow = 0.0f;
14791479

@@ -1699,7 +1699,7 @@ protected static void PropagateBrakeLinePressures(float elapsedClockSeconds, Tra
16991699
MSTSLocomotive leadLoco = train.DPLeadUnits[i] as MSTSLocomotive;
17001700
BrakeSystem locoBrakeSystem = train.DPLeadUnits[i].BrakeSystem;
17011701

1702-
bool syncIndependent = leadLoco == lead ? true : leadLoco.DPSyncIndependent && lead.DPSyncIndependent;
1702+
bool syncIndependent = lead != null && (leadLoco == lead || (leadLoco.DPSyncIndependent && lead.DPSyncIndependent));
17031703

17041704
// Set loco brake pressure on all units with brakes cut in
17051705
// Only set loco brake pressure on DP units if lead loco AND DP loco are equipped to synchronize braking

0 commit comments

Comments
 (0)