Skip to content

Commit ffae563

Browse files
committed
Automatic merge of T1.5.1-1074-g3f93a3779d and 22 pull requests
- Pull request #799 at dfc715e: Consolidated wind simulation - 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 8f695a4: Blueprint/train car operations UI window - Pull request #885 at e267870: feat: Add notifications to Menu - Pull request #891 at 9a1d6b2: Auto save - 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 #900 at c27f32d: DMI updates - Pull request #903 at 3e390b8: Downloading route content (Github, zip) - Pull request #922 at a3bc9e7: Autopilot for timetable mode - Pull request #946 at 91a03af: Advanced track sounds - Pull request #952 at 8347095: Investigation - Pulsing graphics - Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes - Pull request #954 at 84c2f4b: Add Support for Multiple Track Profiles - Pull request #959 at 2452cb0: Fix TrackViewer crash on big zoom value - Pull request #962 at 46d0472: Fix pantographs on unpowered cars - Pull request #964 at b11c894: fix: Warning CA1417: Do not use the 'OutAttribute' for string parameter - Pull request #965 at 7554f02: style: Renormalize line endings - Pull request #966 at 6353e03: fix: Warning CS0618: 'string.Copy(string)' is obsolete - Pull request #967 at a799e20: Fix AI Lights After Reversing Points - Pull request #968 at 5f708ca: Initial build of adding track section identifier for rack railway
24 parents 48ef78a + 3f93a37 + dfc715e + d00beb9 + f92de76 + 8f695a4 + e267870 + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + 3e390b8 + a3bc9e7 + 91a03af + 8347095 + a519452 + 84c2f4b + 2452cb0 + 46d0472 + b11c894 + 7554f02 + 6353e03 + a799e20 + 5f708ca commit ffae563

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ public enum LocomotiveRailDriveTypes
114114

115115
public LocomotiveRailDriveTypes LocomotiveRailDriveType;
116116

117+
public bool RackGogWheelEngaged = false;
118+
117119
// simulation parameters
118120
public bool ManualHorn = false;
119121
public bool TCSHorn = false;
@@ -2058,6 +2060,14 @@ public override void Update(float elapsedClockSeconds)
20582060
foreach (var axle in LocomotiveAxles)
20592061
{
20602062
axle.CogWheelFitted = true;
2063+
if (axle.IsRackRailway && axle.CogWheelFitted)
2064+
{
2065+
RackGogWheelEngaged = true;
2066+
}
2067+
else
2068+
{
2069+
RackGogWheelEngaged = false;
2070+
}
20612071
}
20622072
}
20632073

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7912,6 +7912,7 @@ public override string GetDebugStatus()
79127912

79137913
// calculate values for display, so that display value doesn't go negative
79147914
var superheatTempDisplayC = C.FromF(CurrentSuperheatTempF);
7915+
79157916
superheatTempDisplayC = MathHelper.Clamp(superheatTempDisplayC, 0.0f, C.FromF(MaxSuperheatRefTempF));
79167917

79177918
status.AppendFormat("{0}\t{1}\t{2}\t{3}\t{4}\t{5}\t{6}\t{7}\t{8}\n",

Source/RunActivity/Viewer3D/Popups/HUDWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,7 @@ void TextPageForceInfo(TableData table)
11771177
table.CurrentRow = row0;
11781178
var axle = mstsLocomotive.LocomotiveAxles[i];
11791179
TableSetCell(table, table.CurrentRow++, table.CurrentValueColumn + 2 * i, "{0:F0}% ({1})", axle.SlipSpeedPercent, FormatStrings.FormatVeryLowSpeedDisplay((float)axle.WheelSlipThresholdMpS, mstsLocomotive.IsMetric));
1180-
if (axle.IsRackRailway) TableSetCell(table, table.CurrentRow++, table.CurrentValueColumn + 2 * i, Viewer.Catalog.GetString("rack"));
1180+
if (mstsLocomotive.RackGogWheelEngaged) TableSetCell(table, table.CurrentRow++, table.CurrentValueColumn + 2 * i, Viewer.Catalog.GetString("Rack"));
11811181
else TableSetCell(table, table.CurrentRow++, table.CurrentValueColumn + 2 * i, "{0:F0}%", mstsLocomotive.AdhesionConditions * 100.0f);
11821182
TableSetCell(table, table.CurrentRow++, table.CurrentValueColumn + 2 * i, "{0} ({1})", FormatStrings.FormatForce(axle.DriveForceN, mstsLocomotive.IsMetric), FormatStrings.FormatPower(axle.DriveForceN * mstsLocomotive.AbsTractionSpeedMpS, mstsLocomotive.IsMetric, false, false));
11831183
TableSetCell(table, table.CurrentRow++, table.CurrentValueColumn + 2 * i, "{0}", FormatStrings.FormatForce(axle.BrakeRetardForceN, mstsLocomotive.IsMetric));

0 commit comments

Comments
 (0)