Skip to content

Commit 6eb9a1d

Browse files
committed
Automatic merge of T1.5.1-1689-g72674c98d and 14 pull requests
- Pull request #900 at 4629736: DMI in 3D cab + two more dials - Pull request #1030 at d3ae4a2: Refactor settings, in prep for settings exporter - Pull request #1045 at cc4d53c: Bugfix: Empty Start Time for Explore, and other issues loading from Menu Selection and Content Routes - Pull request #1052 at 5bbc476: Content Manager: Add axle count, and lowest derail force - Pull request #1062 at 3b18c48: Train Forces popup Window. - Pull request #1064 at 53dd604: Add Train Info tab to Help window (F1) - Pull request #1066 at 62c89c1: Log derailment, using TraceInformation. - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #1000 at d8d9709: Locomotive operation from control car - Pull request #1029 at 92c74ef: Superelevation Follow Up Fixes - Pull request #1057 at 29a0d37: Switchable brake system - Pull request #1065 at 409064d: Fix for PantographToggle sound event - Pull request #1068 at d6e1f83: Build for online-only documentation files - Pull request #896 at f1681df: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
16 parents c7db763 + 72674c9 + 4629736 + d3ae4a2 + cc4d53c + 5bbc476 + 3b18c48 + 53dd604 + 62c89c1 + 1f5ba4c + d8d9709 + 92c74ef + 29a0d37 + 409064d + d6e1f83 + f1681df commit 6eb9a1d

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

Source/Contrib/ContentManager/Models/Car.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ public Car(Content content)
100100
// this is not always correct as TrainCar uses the WheelAxles array for the count; that is too complex to do here
101101
if (SubType.Equals("Steam") && NumDriveAxles >= (NumDriveAxles + NumIdleAxles)) { NumDriveAxles /= 2; }
102102

103+
// see TrainCar.UpdateTrainDerailmentRisk(), ~ line 1609
103104
NumAllAxles = NumDriveAxles + NumIdleAxles;
104105

105106
// see TrainCar.UpdateTrainDerailmentRisk()

Source/Contrib/ContentManager/Models/Consist.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ public Consist(Content content)
114114
// this is not always correct as TrainCar uses the WheelAxles array for the count; that is too complex to do here
115115
if (subType.Equals("Steam") && numDriveAxles >= (numDriveAxles + numIdleAxles)) { numDriveAxles /= 2; }
116116

117+
// see TrainCar.UpdateTrainDerailmentRisk(), ~ line 1609
117118
numAllAxles = numDriveAxles + numIdleAxles;
118119

119120
// exclude legacy EOT from total axle count

0 commit comments

Comments
 (0)