Skip to content

Commit feff20c

Browse files
committed
Change variable name
1 parent 156a2be commit feff20c

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds, float t,
669669
// its impact. More modern locomotive have a more sophisticated system that eliminates slip in the majority (if not all circumstances).
670670
// Simple adhesion control does not have any slip control feature built into it.
671671
// TODO - a full review of slip/no slip control.
672-
if (ElectricMotorType == ElectricMotorTypes.AC)
672+
if (TractionMotorType == TractionMotorTypes.AC)
673673
{
674674
AbsTractionSpeedMpS = AbsSpeedMpS;
675675
if (AbsWheelSpeedMpS > 1.1 * MaxSpeedMpS)

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -432,12 +432,12 @@ public float OdometerM
432432
public float DynamicBrakeIntervention = -1;
433433
protected float PreviousDynamicBrakeIntervention = -1;
434434

435-
public enum ElectricMotorTypes
435+
public enum TractionMotorTypes
436436
{
437437
AC,
438438
DC
439439
}
440-
public ElectricMotorTypes ElectricMotorType;
440+
public TractionMotorTypes TractionMotorType;
441441

442442
public ILocomotivePowerSupply LocomotivePowerSupply => PowerSupply as ILocomotivePowerSupply;
443443
public ScriptedTrainControlSystem TrainControlSystem;
@@ -899,16 +899,16 @@ public override void Parse(string lowercasetoken, STFReader stf)
899899
STFException.TraceWarning(stf, "Skipped unknown engine type " + engineType);
900900
}
901901
break;
902-
case "engine(ortselectricmotortype":
902+
case "engine(ortstractionmotortype":
903903
stf.MustMatch("(");
904-
string electricMotorType = stf.ReadString().ToUpper();
904+
string tractionMotorType = stf.ReadString().ToUpper();
905905
try
906906
{
907-
ElectricMotorType = (ElectricMotorTypes)Enum.Parse(typeof(ElectricMotorTypes), electricMotorType);
907+
TractionMotorType = (TractionMotorTypes)Enum.Parse(typeof(TractionMotorTypes), tractionMotorType);
908908
}
909909
catch
910910
{
911-
STFException.TraceWarning(stf, "Skipped unknown electric motor type " + electricMotorType);
911+
STFException.TraceWarning(stf, "Skipped unknown traction motor type " + tractionMotorType);
912912
}
913913
break;
914914

@@ -1109,7 +1109,7 @@ public override void Copy(MSTSWagon copy)
11091109
UnloadingSpeedMpS = locoCopy.UnloadingSpeedMpS;
11101110
SlipControlSystem = locoCopy.SlipControlSystem;
11111111
EngineType = locoCopy.EngineType;
1112-
ElectricMotorType = locoCopy.ElectricMotorType;
1112+
TractionMotorType = locoCopy.TractionMotorType;
11131113
TractiveForceCurves = locoCopy.TractiveForceCurves;
11141114
MaxContinuousForceN = locoCopy.MaxContinuousForceN;
11151115
SpeedOfMaxContinuousForceMpS = locoCopy.SpeedOfMaxContinuousForceMpS;
@@ -2237,7 +2237,7 @@ protected virtual void UpdateTractiveForce(float elapsedClockSeconds, float t, f
22372237
// More modern locomotive have a more sophisticated system that eliminates slip in the majority (if not all circumstances).
22382238
// Simple adhesion control does not have any slip control feature built into it.
22392239
// TODO - a full review of slip/no slip control.
2240-
if (ElectricMotorType == ElectricMotorTypes.AC)
2240+
if (TractionMotorType == TractionMotorTypes.AC)
22412241
{
22422242
AbsTractionSpeedMpS = AbsSpeedMpS;
22432243
if (AbsWheelSpeedMpS > 1.1 * MaxSpeedMpS)

0 commit comments

Comments
 (0)