Skip to content

Commit 1c55709

Browse files
authored
Merge pull request #928 from SteelFill/dpu_brakes
Fix Missing Initializations From Copy() in MSTSLocomotive
2 parents 0a17d98 + 9f2f220 commit 1c55709

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,16 +1273,28 @@ public override void Copy(MSTSWagon copy)
12731273
CompressorRestartPressurePSI = locoCopy.CompressorRestartPressurePSI;
12741274
CompressorIsMUControlled = locoCopy.CompressorIsMUControlled;
12751275
TrainBrakePipeLeakPSIorInHgpS = locoCopy.TrainBrakePipeLeakPSIorInHgpS;
1276+
BrakePipeTimeFactorS = locoCopy.BrakePipeTimeFactorS;
1277+
BrakeServiceTimeFactorPSIpS = locoCopy.BrakeServiceTimeFactorPSIpS;
1278+
BrakeEmergencyTimeFactorPSIpS = locoCopy.BrakeEmergencyTimeFactorPSIpS;
1279+
BrakePipeChargingRatePSIorInHgpS = locoCopy.BrakePipeChargingRatePSIorInHgpS;
1280+
BrakePipeQuickChargingRatePSIpS = locoCopy.BrakePipeQuickChargingRatePSIpS;
12761281
MaxMainResPressurePSI = locoCopy.MaxMainResPressurePSI;
12771282
MainResPressurePSI = locoCopy.MaxMainResPressurePSI;
12781283
MaximumMainReservoirPipePressurePSI = locoCopy.MaximumMainReservoirPipePressurePSI;
12791284
MainResVolumeM3 = locoCopy.MainResVolumeM3;
12801285
MainResChargingRatePSIpS = locoCopy.MainResChargingRatePSIpS;
1286+
EngineBrakeApplyRatePSIpS = locoCopy.EngineBrakeApplyRatePSIpS;
1287+
EngineBrakeReleaseRatePSIpS = locoCopy.EngineBrakeReleaseRatePSIpS;
12811288
BrakePipeDischargeTimeFactor = locoCopy.BrakePipeDischargeTimeFactor;
12821289
DriveWheelOnlyBrakes = locoCopy.DriveWheelOnlyBrakes;
12831290
DynamicBrakeBlendingEnabled = locoCopy.DynamicBrakeBlendingEnabled;
12841291
DynamicBrakeAvailable = locoCopy.DynamicBrakeAvailable;
12851292
airPipeSystem = locoCopy.airPipeSystem;
1293+
DoesVacuumBrakeCutPower = locoCopy.DoesVacuumBrakeCutPower;
1294+
DoesBrakeCutPower = locoCopy.DoesBrakeCutPower;
1295+
BrakeCutsPowerAtBrakeCylinderPressurePSI = locoCopy.BrakeCutsPowerAtBrakeCylinderPressurePSI;
1296+
BrakeCutsPowerAtBrakePipePressurePSI = locoCopy.BrakeCutsPowerAtBrakePipePressurePSI;
1297+
BrakeRestoresPowerAtBrakePipePressurePSI = locoCopy.BrakeRestoresPowerAtBrakePipePressurePSI;
12861298
DynamicBrakeCommandStartTime = locoCopy.DynamicBrakeCommandStartTime;
12871299
DynamicBrakeBlendingOverride = locoCopy.DynamicBrakeBlendingOverride;
12881300
DynamicBrakeBlendingForceMatch = locoCopy.DynamicBrakeBlendingForceMatch;
@@ -1291,6 +1303,7 @@ public override void Copy(MSTSWagon copy)
12911303
MainPressureUnit = locoCopy.MainPressureUnit;
12921304
BrakeSystemPressureUnits = locoCopy.BrakeSystemPressureUnits;
12931305
IsDriveable = copy.IsDriveable;
1306+
EngineOperatingProcedures = locoCopy.EngineOperatingProcedures;
12941307

12951308
ThrottleController = (MSTSNotchController)locoCopy.ThrottleController.Clone();
12961309
SteamHeatController = (MSTSNotchController)locoCopy.SteamHeatController.Clone();
@@ -1308,9 +1321,14 @@ public override void Copy(MSTSWagon copy)
13081321
}
13091322
else
13101323
DPDynamicBrakeController = null;
1324+
DPSyncTrainApplication = locoCopy.DPSyncTrainApplication;
1325+
DPSyncTrainRelease = locoCopy.DPSyncTrainRelease;
1326+
DPSyncEmergency = locoCopy.DPSyncEmergency;
1327+
DPSyncIndependent = locoCopy.DPSyncIndependent;
13111328

13121329
LocomotivePowerSupply.Copy(locoCopy.LocomotivePowerSupply);
13131330
TrainControlSystem.Copy(locoCopy.TrainControlSystem);
1331+
VigilanceMonitor = locoCopy.VigilanceMonitor;
13141332
LocomotiveName = locoCopy.LocomotiveName;
13151333
MaxVaccuumMaxPressurePSI = locoCopy.MaxVaccuumMaxPressurePSI;
13161334
VacuumBrakeEQFitted = locoCopy.VacuumBrakeEQFitted;
@@ -1324,6 +1342,8 @@ public override void Copy(MSTSWagon copy)
13241342
WaterScoopWidthM = locoCopy.WaterScoopWidthM;
13251343
CruiseControl = locoCopy.CruiseControl?.Clone(this);
13261344
MultiPositionControllers = locoCopy.CloneMPC(this);
1345+
OnLineCabRadio = locoCopy.OnLineCabRadio;
1346+
OnLineCabRadioURL = locoCopy.OnLineCabRadioURL;
13271347
}
13281348

13291349
/// <summary>

0 commit comments

Comments
 (0)