Attempt to resolve PR conflict

peternewell · peternewell · commit be2319ccc025 · 2023-12-09T11:18:35.000+11:00
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -2009,9 +2009,9 @@ public override void Update(float elapsedClockSeconds)
             // Cruise Control
             CruiseControl?.Update(elapsedClockSeconds);
 
+            // TODO  this is a wild simplification for electric and diesel electric
             if (EngineType == EngineTypes.Diesel || EngineType == EngineTypes.Electric)
             {
-                // TODO  this is a wild simplification for electric and diesel electric
                 UpdateTractiveForce(elapsedClockSeconds, ThrottlePercent / 100f, AbsSpeedMpS, AbsWheelSpeedMpS, 0);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -2009,9 +2009,9 @@ public override void Update(float elapsedClockSeconds)`
`2009`	`2009`	`// Cruise Control`
`2010`	`2010`	`CruiseControl?.Update(elapsedClockSeconds);`
`2011`	`2011`
	`2012`	`+ // TODO this is a wild simplification for electric and diesel electric`
`2012`	`2013`	`if (EngineType == EngineTypes.Diesel \|\| EngineType == EngineTypes.Electric)`
`2013`	`2014`	`{`
`2014`		`- // TODO this is a wild simplification for electric and diesel electric`
`2015`	`2015`	`UpdateTractiveForce(elapsedClockSeconds, ThrottlePercent / 100f, AbsSpeedMpS, AbsWheelSpeedMpS, 0);`
`2016`	`2016`	`}`
`2017`	`2017`