Skip to content

Commit 48479b4

Browse files
committed
Automatic merge of T1.5.1-340-g907936445 and 9 pull requests
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor - Pull request #732 at 1edb2e5: Improvements for air brakes - Pull request #751 at 00981a2: Web interface to control cab controls with external hardware - Pull request #767 at 4cb5c77: Refine sunrise and sunset - Pull request #803 at 7157e08: Various adjustments to steam adhesion - Pull request #807 at 791c0a3: fix: Stop z-fighting by pushing world/view/projection multiplications onto the GPU - Pull request #809 at f67822a: Some on-screen messages not suppressed, Bug #2008012 - Pull request #810 at e2ad93e: Bug fix for AI train WP restart events don't work after save - Pull request #811 at f784151: Bug fix for https://bugs.launchpad.net/or/+bug/2009842 DPU: wrong BP and MR values of helpers in display
11 parents 7869578 + 9079364 + fb9079e + 1edb2e5 + 00981a2 + 4cb5c77 + 7157e08 + 791c0a3 + f67822a + e2ad93e + f784151 commit 48479b4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,14 +1159,14 @@ public string GetDpuStatus(bool dataDpu, CABViewControlUnits loadUnits = CABView
11591159
status.AppendFormat("{0:F0}\t", brakeInfoValue);
11601160

11611161
// MR
1162-
status.AppendFormat("{0:F0}", FormatStrings.FormatPressure((Simulator.PlayerLocomotive as MSTSLocomotive).MainResPressurePSI, PressureUnit.PSI, (Simulator.PlayerLocomotive as MSTSLocomotive).BrakeSystemPressureUnits[BrakeSystemComponent.MainReservoir], true));
1162+
status.AppendFormat("{0:F0}", FormatStrings.FormatPressure(MainResPressurePSI, PressureUnit.PSI, (Simulator.PlayerLocomotive as MSTSLocomotive).BrakeSystemPressureUnits[BrakeSystemComponent.MainReservoir], true));
11631163
}
11641164
return status.ToString();
11651165
}
11661166

11671167
string brakeValue(string tokenIni, string tokenEnd) // used by GetDpuStatus(bool dataHud)
11681168
{
1169-
string trainBrakeStatus = Simulator.PlayerLocomotive.GetTrainBrakeStatus();
1169+
string trainBrakeStatus = GetTrainBrakeStatus();
11701170
var brakeInfoValue = "-";
11711171
if (trainBrakeStatus.Contains(tokenIni) && trainBrakeStatus.Contains(tokenEnd))
11721172
{

0 commit comments

Comments
 (0)