Automatic merge of T1.5.1-174-gd2e682132 and 14 pull requests

openrails-bot · openrails-bot · commit d0009d61ad17 · 2023-01-10T19:36:53.000Z
- Pull request #706 at 91bcfa2: Extended door functionality - Pull request #719 at 13a1638: Upgraded to MonoGame 3.8.0 (+ small update for other libraries) - Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor - Pull request #732 at aac9b67: Improvements for air brakes - Pull request #735 at b9a0ea3: Added new parameter for battery switch - Pull request #746 at f5566d7: Website release 1.5.1 - Pull request #753 at ab8fe32: Extends CabControls for user input - Pull request #754 at 70a1325: Container weights: https://blueprints.launchpad.net/or/+spec/container-weights - Pull request #758 at a9e9512: Steam wheel slip#1 - Pull request #760 at 113dd63: Updated EditorConfig with .NET and StyleCop analyzer configuration - Pull request #761 at f6a3aca: fix: Allow 100% cloud-free skys by making 0% overcast = 0% clouds - Pull request #763 at 12e250d: build: Remove use of SolutionDir which is not supported everywhere - Pull request #764 at 5f9a01b: fix: Improve sky dome distortion causing bug #1471416 - Pull request #765 at 083467b: Bug fix for https://bugs.launchpad.net/or/+bug/2002183 OK to proceed sound played wrongly
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -1174,7 +1174,7 @@ public override void Copy(MSTSWagon copy)
             EmergencyEngagesHorn = locoCopy.EmergencyEngagesHorn;
 
             WheelslipCausesThrottleDown = locoCopy.WheelslipCausesThrottleDown;
-            DriveWheelOnlyBrakes = locoCopy.DriveWheelOnlyBrakes;
+
             CompressorIsMechanical = locoCopy.CompressorIsMechanical;
             CompressorRestartPressurePSI = locoCopy.CompressorRestartPressurePSI;
             CompressorIsMUControlled = locoCopy.CompressorIsMUControlled;
@@ -1185,7 +1185,7 @@ public override void Copy(MSTSWagon copy)
             MainResVolumeM3 = locoCopy.MainResVolumeM3;
             MainResChargingRatePSIpS = locoCopy.MainResChargingRatePSIpS;
             BrakePipeDischargeTimeFactor = locoCopy.BrakePipeDischargeTimeFactor;
-
+            DriveWheelOnlyBrakes = locoCopy.DriveWheelOnlyBrakes;
             DynamicBrakeBlended = locoCopy.DynamicBrakeBlended;
             DynamicBrakeBlendingEnabled = locoCopy.DynamicBrakeBlendingEnabled;
             DynamicBrakeAvailable = locoCopy.DynamicBrakeAvailable;
