Skip to content

Commit 9cbbd6f

Browse files
authored
Merge pull request #938 from SteelFill/initialization_fixes
Fix Missing Initializations From Copy in MSTSWagon.cs
2 parents dfb4e5c + ebe8047 commit 9cbbd6f

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,6 +1601,7 @@ public virtual void Copy(MSTSWagon copy)
16011601
TenderWagonMaxCoalMassKG = copy.TenderWagonMaxCoalMassKG;
16021602
TenderWagonMaxWaterMassKG = copy.TenderWagonMaxWaterMassKG;
16031603
InitWagonNumAxles = copy.InitWagonNumAxles;
1604+
WagonNumAxles = copy.WagonNumAxles;
16041605
DerailmentCoefficientEnabled = copy.DerailmentCoefficientEnabled;
16051606
WagonNumBogies = copy.WagonNumBogies;
16061607
MSTSWagonNumWheels = copy.MSTSWagonNumWheels;
@@ -1672,6 +1673,7 @@ public virtual void Copy(MSTSWagon copy)
16721673
AxleInertiaKgm2 = copy.AxleInertiaKgm2;
16731674
SlipWarningThresholdPercent = copy.SlipWarningThresholdPercent;
16741675
Lights = copy.Lights;
1676+
HasInsideView = copy.HasInsideView;
16751677
ExternalSoundPassThruPercent = copy.ExternalSoundPassThruPercent;
16761678
TrackSoundPassThruPercent = copy.TrackSoundPassThruPercent;
16771679
foreach (PassengerViewPoint passengerViewPoint in copy.PassengerViewpoints)
@@ -1830,18 +1832,12 @@ public override void Save(BinaryWriter outf)
18301832
outf.Write(Variable1_2);
18311833
outf.Write(Variable1_3);
18321834
outf.Write(Variable1_4);
1833-
outf.Write(IsDavisFriction);
1834-
outf.Write(IsRollerBearing);
1835-
outf.Write(IsLowTorqueRollerBearing);
1836-
outf.Write(IsFrictionBearing);
18371835
outf.Write(Friction0N);
18381836
outf.Write(DavisAN);
18391837
outf.Write(DavisBNSpM);
18401838
outf.Write(DavisCNSSpMM);
1841-
outf.Write(StandstillFrictionN);
18421839
outf.Write(MergeSpeedFrictionN);
18431840
outf.Write(IsBelowMergeSpeed);
1844-
outf.Write(MergeSpeedMpS);
18451841
outf.Write(MassKG);
18461842
outf.Write(MaxBrakeForceN);
18471843
outf.Write(MaxHandbrakeForceN);
@@ -1895,18 +1891,12 @@ public override void Restore(BinaryReader inf)
18951891
Variable1_2 = inf.ReadSingle();
18961892
Variable1_3 = inf.ReadSingle();
18971893
Variable1_4 = inf.ReadSingle();
1898-
IsDavisFriction = inf.ReadBoolean();
1899-
IsRollerBearing = inf.ReadBoolean();
1900-
IsLowTorqueRollerBearing = inf.ReadBoolean();
1901-
IsFrictionBearing = inf.ReadBoolean();
19021894
Friction0N = inf.ReadSingle();
19031895
DavisAN = inf.ReadSingle();
19041896
DavisBNSpM = inf.ReadSingle();
19051897
DavisCNSSpMM = inf.ReadSingle();
1906-
StandstillFrictionN = inf.ReadSingle();
19071898
MergeSpeedFrictionN = inf.ReadSingle();
19081899
IsBelowMergeSpeed = inf.ReadBoolean();
1909-
MergeSpeedMpS = inf.ReadSingle();
19101900
MassKG = inf.ReadSingle();
19111901
MaxBrakeForceN = inf.ReadSingle();
19121902
MaxHandbrakeForceN = inf.ReadSingle();

0 commit comments

Comments
 (0)