Suggested reviewer changes

Author: peternewell

Source/Orts.Simulation/Simulation/AIs/AI.cs

@@ -926,11 +926,11 @@ public AITrain CreateAITrainDetail(Service_Definition sd, Traffic_Service_Defini
                             mstsSteamLocomotive.CombinedTenderWaterVolumeUKG = ORTS.Common.Kg.ToLb(mstsSteamLocomotive.MaxLocoTenderWaterMassKG) / 10.0f * Simulator.Activity.Tr_Activity.Tr_Activity_Header.FuelWater / 100.0f;
 
                             // Adjust fuel stocks depending upon fuel used - in Activity mode
-                            if (mstsSteamLocomotive.SteamLocomotiveFuelType == MSTSLocomotive.SteamLocomotiveFuelTypes.Wood)
+                            if (mstsSteamLocomotive.SteamLocomotiveFuelType == MSTSSteamLocomotive.SteamLocomotiveFuelTypes.Wood)
                             {
                                 mstsSteamLocomotive.TenderFuelMassKG = mstsSteamLocomotive.MaxTenderFuelMassKG * Simulator.Activity.Tr_Activity.Tr_Activity_Header.FuelWood / 100.0f;
                             }
-                            else if (mstsSteamLocomotive.SteamLocomotiveFuelType == MSTSLocomotive.SteamLocomotiveFuelTypes.Oil)
+                            else if (mstsSteamLocomotive.SteamLocomotiveFuelType == MSTSSteamLocomotive.SteamLocomotiveFuelTypes.Oil)
                             {
                                 mstsSteamLocomotive.TenderFuelMassKG = mstsSteamLocomotive.MaxTenderFuelMassKG * Simulator.Activity.Tr_Activity.Tr_Activity_Header.FuelDiesel / 100.0f;
                             }

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

@@ -239,25 +239,6 @@ public float CurrentLocomotiveSteamHeatBoilerWaterCapacityL
         //float DebugSpeed = 5.0f; // Initialise at 5 mph
         //float DebugTimer = 0.0f;
 
-        public enum SteamLocomotiveFuelTypes
-        {
-            Unknown,
-            Oil,
-            Wood, // not used at the moment
-            Coal, // defaults to coal
-        }
-
-        public SteamLocomotiveFuelTypes SteamLocomotiveFuelType;
-
-        public enum SteamLocomotiveFeedWaterSystemTypes
-        {
-            Unknown,
-            MotionPump,
-            SteamInjector, // not used at the moment
-        }
-
-        public SteamLocomotiveFeedWaterSystemTypes SteamLocomotiveFeedWaterType;
-
         // Adhesion parameters
         public enum SlipControlType
         {

Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs

@@ -84,6 +84,8 @@
 using Orts.Simulation.Simulation.RollingStocks.SubSystems.PowerSupplies;
 using Orts.Simulation.RollingStocks.SubSystems.PowerTransmissions;
 using SharpDX.Direct3D9;
+using Orts.Simulation.RollingStocks;
+using static Orts.Simulation.RollingStocks.MSTSSteamLocomotive;
 
 namespace Orts.Simulation.RollingStocks
 {
@@ -684,11 +686,30 @@ public float TenderFuelMassKG              // Decreased by firing and increased
         float ConnectRodLengthFt = 10.8f;
         float RodCoGFt = 4.32f;  // 0.4 from crank end of rod
 
-        #endregion
+        public enum SteamLocomotiveFuelTypes
+        {
+            Unknown,
+            Oil,
+            Wood,
+            Coal, // defaults to coal
+        }
+
+        public SteamLocomotiveFuelTypes SteamLocomotiveFuelType;
+
+        public enum SteamLocomotiveFeedWaterSystemTypes
+        {
+            Unknown,
+            MotionPump,
+            SteamInjector, // not used at the moment
+        }
+
+        public SteamLocomotiveFeedWaterSystemTypes SteamLocomotiveFeedWaterType;
+
+#endregion
 
-        #region Variables for visual effects (steam, smoke)
+#region Variables for visual effects (steam, smoke)
 
-        public readonly SmoothedData StackSteamVelocityMpS = new SmoothedData(2);
+public readonly SmoothedData StackSteamVelocityMpS = new SmoothedData(2);
         public float StackSteamVolumeM3pS;
         public float StackParticleDurationS;
         public float StackCount;

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

@@ -52,7 +52,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using static Orts.Simulation.RollingStocks.MSTSLocomotive;
 using Event = Orts.Common.Event;
 
 namespace Orts.Simulation.RollingStocks
@@ -148,7 +147,7 @@ public enum WindowState
         public float WagonFrontalAreaM2; // Frontal area of wagon
         public float TrailLocoResistanceFactor; // Factor to reduce base and wind resistance if locomotive is not leading - based upon original Davis drag coefficients
 
-        bool TenderWeightInitialize = true;
+        bool TenderWeightInitialized = false;
         float TenderWagonMaxFuelMassKG;
         float TenderWagonMaxOilMassL;
         float TenderWagonMaxWaterMassKG;
@@ -1969,7 +1968,7 @@ public override void Update(float elapsedClockSeconds)
             ConfirmSteamLocomotiveTender(); // Confirms that a tender is connected to the steam locomotive
 
             // Adjusts water and coal mass based upon values assigned to the tender found in the WAG file rather then those defined in ENG file.
-            if (WagonType == WagonTypes.Tender && TenderWeightInitialize && (TenderWagonMaxFuelMassKG != 0 || TenderWagonMaxOilMassL != 0) && TenderWagonMaxWaterMassKG != 0)
+            if (WagonType == WagonTypes.Tender && !TenderWeightInitialized && (TenderWagonMaxFuelMassKG != 0 || TenderWagonMaxOilMassL != 0) && TenderWagonMaxWaterMassKG != 0)
             {
 
                 // Find the associated steam locomotive for this tender
@@ -1993,7 +1992,7 @@ public override void Update(float elapsedClockSeconds)
 
                         TendersSteamLocomotive.MaxLocoTenderWaterMassKG = TenderWagonMaxWaterMassKG;
 
-                        if (TendersSteamLocomotive.SteamLocomotiveFuelType == SteamLocomotiveFuelTypes.Oil)
+                        if (TendersSteamLocomotive.SteamLocomotiveFuelType == MSTSSteamLocomotive.SteamLocomotiveFuelTypes.Oil)
                         {
                             TendersSteamLocomotive.MaxTenderFuelMassKG = TendersSteamLocomotive.MaxTenderOilMassL * TendersSteamLocomotive.OilSpecificGravity;
                         }
@@ -2010,7 +2009,7 @@ public override void Update(float elapsedClockSeconds)
                 }
 
                 // Rest flag so that this loop is not executed again
-                TenderWeightInitialize = false;
+                TenderWeightInitialized = true;
             }
 
             UpdateTenderLoad(); // Updates the load physics characteristics of tender and aux tender

Source/Orts.Simulation/Simulation/Simulator.cs

@@ -1317,11 +1317,11 @@ private Train InitializePlayerTrain()
                         mstsSteamLocomotive.CombinedTenderWaterVolumeUKG = (Kg.ToLb(mstsSteamLocomotive.MaxLocoTenderWaterMassKG) / 10.0f) * Activity.Tr_Activity.Tr_Activity_Header.FuelWater / 100.0f;
 
                         // Adjust fuel stocks depending upon fuel used - in Explore mode
-                        if (mstsSteamLocomotive.SteamLocomotiveFuelType == MSTSLocomotive.SteamLocomotiveFuelTypes.Wood)
+                        if (mstsSteamLocomotive.SteamLocomotiveFuelType == MSTSSteamLocomotive.SteamLocomotiveFuelTypes.Wood)
                         {
                             mstsSteamLocomotive.TenderFuelMassKG = mstsSteamLocomotive.MaxTenderFuelMassKG * Activity.Tr_Activity.Tr_Activity_Header.FuelWood / 100.0f;
                         }
-                        else if (mstsSteamLocomotive.SteamLocomotiveFuelType == MSTSLocomotive.SteamLocomotiveFuelTypes.Oil)
+                        else if (mstsSteamLocomotive.SteamLocomotiveFuelType == MSTSSteamLocomotive.SteamLocomotiveFuelTypes.Oil)
                         {
                             mstsSteamLocomotive.TenderFuelMassKG = mstsSteamLocomotive.MaxTenderFuelMassKG * Activity.Tr_Activity.Tr_Activity_Header.FuelDiesel / 100.0f;
                         }