Skip to content

Commit 57dfe63

Browse files
committed
Fix superheat display
1 parent 32bb911 commit 57dfe63

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6369,6 +6369,10 @@ public override string GetDebugStatus()
63696369
FormatStrings.FormatEnergy(W.FromBTUpS(BoilerHeatBTU), IsMetric)
63706370
);
63716371

6372+
// calculate values for display, so that display value doesn't go negative
6373+
var superheatTempDisplayC = C.FromF(CurrentSuperheatTempF);
6374+
superheatTempDisplayC = MathHelper.Clamp(superheatTempDisplayC, 0.0f, C.FromF(MaxSuperheatRefTempF));
6375+
63726376
status.AppendFormat("{0}\t{1}\t{2}\t{3}\t{4}\t{5}\t{6}\t{7}\t{8}\n",
63736377
Simulator.Catalog.GetString("Temp:"),
63746378
Simulator.Catalog.GetString("Flue"),
@@ -6378,7 +6382,8 @@ public override string GetDebugStatus()
63786382
Simulator.Catalog.GetString("MaxSupH"),
63796383
FormatStrings.FormatTemperature(C.FromF(MaxSuperheatRefTempF), IsMetric, false),
63806384
Simulator.Catalog.GetString("CurSupH"),
6381-
FormatStrings.FormatTemperature(C.FromF(CurrentSuperheatTempF), IsMetric, false));
6385+
FormatStrings.FormatTemperature(superheatTempDisplayC, IsMetric, false)
6386+
);
63826387

63836388
status.AppendFormat("\n\t\t === {0} === \t\t{1}/{2}\n",
63846389
Simulator.Catalog.GetString("Steam Usage"),
@@ -6819,8 +6824,8 @@ public override string GetDebugStatus()
68196824
);
68206825
}
68216826

6822-
if (Simulator.UseAdvancedAdhesion && !Simulator.Settings.SimpleControlPhysics && SteamEngineType != SteamEngineTypes.Geared)
6823-
// Only display slip monitor if advanced adhesion is set and simplecontrols/physics not set
6827+
if (Simulator.UseAdvancedAdhesion && !Simulator.Settings.SimpleControlPhysics && SteamEngineType != SteamEngineTypes.Geared)
6828+
// Only display slip monitor if advanced adhesion is set and simplecontrols/physics not set
68246829
{
68256830
status.AppendFormat("\n\t\t === {0} === \n", Simulator.Catalog.GetString("Slip Monitor"));
68266831
status.AppendFormat("{0}\t{1}\t{2:N0}\t{3}\t{4}\t{5}\t{6}\t{7}\t{8:N2}\t{9}\t{10}\t{11:N2}\t{12}\t{13}\t{14:N1}\n",

0 commit comments

Comments
 (0)