Skip to content

Commit c42855d

Browse files
committed
Automatic merge of T1.5.1-794-g4cad06780 and 14 pull requests
- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting - 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 a055bca: Blueprint/train car operations UI window - Pull request #885 at 8f94333: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - 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 #897 at 0a9d939: feat: Improved system information collection - Pull request #899 at 99764f6: Duplex steam engines - Booster Engine addition - Pull request #903 at 7353625: Downloading route content (Github, zip) - Pull request #906 at 5850660: Bug fix for https://bugs.launchpad.net/or/+bug/2047299 Crash loading a 3Dcab-only loco - Pull request #907 at 9b0b04f: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel - Pull request #908 at 4b4afe3: feat: supports switching adhesion precisions
16 parents e94c26c + 4cad067 + 3539862 + d00beb9 + f92de76 + a055bca + 8f94333 + 6c0785b + 1f5ba4c + 5866028 + 0a9d939 + 99764f6 + 7353625 + 5850660 + 9b0b04f + 4b4afe3 commit c42855d

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5838,6 +5838,15 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float loc
58385838
MaxPowerW = 0;
58395839
MaxForceN = 0;
58405840

5841+
if (WheelSlip && AdvancedAdhesionModel)
5842+
{
5843+
AbsTractionSpeedMpS = AbsWheelSpeedMpS;
5844+
}
5845+
else
5846+
{
5847+
AbsTractionSpeedMpS = AbsSpeedMpS;
5848+
}
5849+
58415850
// Update tractive effort across all steam engines
58425851
for (int i = 0; i < SteamEngines.Count; i++)
58435852
{

0 commit comments

Comments
 (0)