Rename variable

Author: cesarBLG

Source/Orts.Formats.Msts/CabViewFile.cs

@@ -342,14 +342,14 @@ public enum DiscreteStates
     public struct CabViewControlType
     {
         public CABViewControlTypes Type;
-        public int Subtype;
+        public int Id;
         public CabViewControlType(string name)
         {
             Type = CABViewControlTypes.NONE;
-            Subtype = 0;
+            Id = 0;
             if (name != null && name.ToUpperInvariant().StartsWith("ORTS_TCS"))
             {
-                if (int.TryParse(name.Substring(8), out Subtype))
+                if (int.TryParse(name.Substring(8), out Id))
                 {
                     Type = CABViewControlTypes.ORTS_TCS;
                 }
@@ -358,7 +358,7 @@ public CabViewControlType(string name)
         }
         public override string ToString()
         {
-            if (Type == CABViewControlTypes.ORTS_TCS) return Type.ToString() + Subtype;
+            if (Type == CABViewControlTypes.ORTS_TCS) return Type.ToString() + Id;
             return Type.ToString();
         }
     }
@@ -592,7 +592,7 @@ public CVCDial(CABViewControlTypes dialtype, int maxvalue, STFReader stf, string
             ControlType = new CabViewControlType()
             {
                 Type = dialtype,
-                Subtype = 0,
+                Id = 0,
             };
             ControlStyle = CABViewControlStyles.NEEDLE;
             Direction = 0;

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

@@ -5816,7 +5816,7 @@ public virtual float GetDataOf(CabViewControl cvc)
                     }
 
                 case CABViewControlTypes.ORTS_TCS:
-                    TrainControlSystem.CabDisplayControls.TryGetValue(cvc.ControlType.Subtype - 1, out data);
+                    TrainControlSystem.CabDisplayControls.TryGetValue(cvc.ControlType.Id - 1, out data);
                     break;
 
                 case CABViewControlTypes.ORTS_BATTERY_SWITCH_COMMAND_SWITCH:

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

@@ -2302,7 +2302,7 @@ public bool IsMouseWithin()
 
         public string GetControlName()
         {
-            if (ControlDiscrete.ControlType.Type == CABViewControlTypes.ORTS_TCS) return (Locomotive as MSTSLocomotive).TrainControlSystem.GetDisplayString(ControlDiscrete.ControlType.Subtype);
+            if (ControlDiscrete.ControlType.Type == CABViewControlTypes.ORTS_TCS) return (Locomotive as MSTSLocomotive).TrainControlSystem.GetDisplayString(ControlDiscrete.ControlType.Id);
             return GetControlType().ToString();
         }
 
@@ -2521,7 +2521,7 @@ public void HandleUserInput()
 
                 // Train Control System controls
                 case CABViewControlTypes.ORTS_TCS:
-                    int commandIndex = Control.ControlType.Subtype - 1;
+                    int commandIndex = Control.ControlType.Id - 1;
                     Locomotive.TrainControlSystem.TCSCommandButtonDown.TryGetValue(commandIndex, out bool currentValue);
                     if (ChangedValue(1) > 0 ^ currentValue)
                         new TCSButtonCommand(Viewer.Log, !currentValue, commandIndex);