Automatic merge of T1.5.1-376-g885592329 and 12 pull requests

openrails-bot · openrails-bot · commit 6c53b43a70c8 · 2023-04-28T10:07:27.000+01:00
- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting - Pull request #732 at 36b4b6d: Improvements for air brakes - Pull request #751 at 00981a2: Web interface to control cab controls with external hardware - Pull request #799 at dc03850: Consolidated wind simulation - Pull request #802 at 4d198e4: Added support for activity location events to the TrackViewer - Pull request #803 at 7157e08: Various adjustments to steam adhesion - Pull request #813 at ff454eb: Refactored garbage generators - Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration - Pull request #818 at 745d101: Allow independent drive axles for locomotives - Pull request #820 at 6e7a5b6: delay option for masterkey does not delay switch off - Pull request #821 at e0fa5a8: Adds suppression of safety valves - Pull request #822 at 82ef736: battery switch two buttons option in combination with a delay
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -2801,17 +2801,9 @@ public virtual void AdvancedAdhesion(float elapsedClockSeconds)
             // This enables steam locomotives to have different speeds for driven and non-driven wheels.
             if (EngineType == EngineTypes.Steam && SteamEngineType != MSTSSteamLocomotive.SteamEngineTypes.Geared)
             {
-                if (AbsSpeedMpS <= 0.15 && !WheelSlip)
-                {
-                    WheelSpeedSlipMpS = SpeedMpS;
-                    WheelSpeedMpS = SpeedMpS;
-                }
-                else
-                {
-                    WheelSpeedSlipMpS = LocomotiveAxles[0].AxleSpeedMpS;
+                WheelSpeedSlipMpS = LocomotiveAxles[0].AxleSpeedMpS;
                     WheelSpeedMpS = SpeedMpS;
                 }
-            }
             else WheelSpeedMpS = LocomotiveAxles[0].AxleSpeedMpS; 
 
         }

Original file line number	Diff line number	Diff line change
`@@ -2801,17 +2801,9 @@ public virtual void AdvancedAdhesion(float elapsedClockSeconds)`
`2801`	`2801`	`// This enables steam locomotives to have different speeds for driven and non-driven wheels.`
`2802`	`2802`	`if (EngineType == EngineTypes.Steam && SteamEngineType != MSTSSteamLocomotive.SteamEngineTypes.Geared)`
`2803`	`2803`	`{`
`2804`		`- if (AbsSpeedMpS <= 0.15 && !WheelSlip)`
`2805`		`- {`
`2806`		`- WheelSpeedSlipMpS = SpeedMpS;`
`2807`		`- WheelSpeedMpS = SpeedMpS;`
`2808`		`- }`
`2809`		`- else`
`2810`		`- {`
`2811`		`- WheelSpeedSlipMpS = LocomotiveAxles[0].AxleSpeedMpS;`
	`2804`	`+ WheelSpeedSlipMpS = LocomotiveAxles[0].AxleSpeedMpS;`
`2812`	`2805`	`WheelSpeedMpS = SpeedMpS;`
`2813`	`2806`	`}`
`2814`		`- }`
`2815`	`2807`	`else WheelSpeedMpS = LocomotiveAxles[0].AxleSpeedMpS;`
`2816`	`2808`
`2817`	`2809`	`}`