Skip to content

Commit 7b9f96a

Browse files
committed
Automatic merge of T1.6-108-g8fb3285d6 and 13 pull requests
- Pull request #1156 at f46d5f2: Fix incorrectly disabled options in train operations window - Pull request #1091 at 492795a: Automatic speed control - 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 #1157 at 39cd994: Dynamic brake authorization by TCS - Pull request #1159 at 48c9a63: Skip OR warnings about TSRE-specific token Ruler - Pull request #1162 at 2516cce: specifies precedence of DDS over ACE - Pull request #1163 at 2f9e292: Fix: Crash when using Camera 8 and F9. - Pull request #1164 at 1ad9889: Fix: F9 crashes with a front coupled single steam locomotive by Csantucci. - Pull request #1082 at 5d1572f: Allow variable water level in glass gauge - Pull request #1128 at 086d502: Particle Emitter Overhaul - Pull request #1160 at 9dc6b3b: Route Based TTrack Sounds
15 parents 56f7e47 + 8fb3285 + f46d5f2 + 492795a + ba3c47f + 91d2d26 + e241a0d + 39cd994 + 48c9a63 + 2516cce + 2f9e292 + 1ad9889 + 5d1572f + 086d502 + 9dc6b3b commit 7b9f96a

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ public float TenderFuelMassKG // Decreased by firing and increased
464464
float MSTSSteamGaugeGlassHeightM;
465465
float WaterGlassLengthM;
466466
float waterGlassFractionLevel; // Water glass level as a fraction
467-
// bool WaterGlassLevelGradientEnabled = false;
467+
468468
float MEPFactor = 0.7f; // Factor to determine the MEP
469469
float GrateAreaDesignFactor = 500.0f; // Design factor for determining Grate Area
470470
float EvapAreaDesignFactor = 10.0f; // Design factor for determining Evaporation Area
@@ -1572,11 +1572,10 @@ public override void Initialize()
15721572
WaterGlassMaxLevel = ((WaterGlassLengthM + BoilerCrownCoverageHeightM + BoilerCrownHeightM) + (BoilerDiameterM / 2.0f)) / BoilerDiameterM; // max height of water gauge as a fraction of boiler level
15731573
WaterGlassMinLevel = referenceBoilerLevelFraction; // min height of water gauge as a fraction of boiler level
15741574

1575-
BoilerWaterFractionAbs = (WaterMinLevel + WaterMaxLevel) / 2; // Initialise current boiler water level
1575+
BoilerWaterFractionAbs = (WaterGlassMinLevel + WaterGlassMaxLevel) / 2; // Initialise current boiler water level to halfway up glass
15761576

15771577
float MaxWaterFraction = BoilerWaterFractionAbs; // Initialise the max water fraction when the boiler starts
15781578

1579-
15801579
if (BoilerEvapRateLbspFt2 == 0) // If boiler evaporation rate is not in ENG file then set a default value
15811580
{
15821581
if (SteamLocomotiveFuelType == SteamLocomotiveFuelTypes.Wood)
@@ -7376,7 +7375,6 @@ private void UpdateFiring(float absSpeedMpS)
73767375

73777376
// var CurrentWaterGaugeFraction = GradientBoilerLevelFraction;
73787377

7379-
73807378
if (SteamLocomotiveFeedWaterType == SteamLocomotiveFeedWaterSystemTypes.MotionPump && !WaterIsExhausted)
73817379
{
73827380

0 commit comments

Comments
 (0)