Cleanup code

Author: Csantucci

Source/Orts.Simulation/MultiPlayer/Message.cs

@@ -2347,7 +2347,7 @@ public override void HandleMsg()
         }
 
     }
-    #endregion MSGGetTrain
+#endregion MSGGetTrain
 
 #region MSGUncouple
 
@@ -2781,7 +2781,7 @@ public override void HandleMsg()
             }
         }
     }
-    #endregion MSGUncouple
+#endregion MSGUncouple
 
 
 #region MSGCouple
@@ -3900,25 +3900,25 @@ public override string ToString()
 
     public class MSGMovingTbl : Message
     {
-        public string user, newTrainName, carID, firstCarIDOld, firstCarIDNew;
-        public MovingTable.submessagecode subMessageCode;
-        public int movingTableIndex;
-        public bool clockwise;
-        public float yangle;
+        private string user;
+        private MovingTable.subMessageCode subMessageCode;
+        private int movingTableIndex;
+        private bool clockwise;
+        private float yangle;
 
         public MSGMovingTbl(string m)
         {
             string[] areas = m.Split('\t');
 
             movingTableIndex = int.Parse(areas[0].Trim());
             user = areas[1].Trim();
-            subMessageCode = (MovingTable.submessagecode) int.Parse(areas[2].Trim());
+            subMessageCode = (MovingTable.subMessageCode)int.Parse(areas[2].Trim());
             clockwise = int.Parse(areas[3].Trim()) == 0 ? false : true;
             yangle = float.Parse(areas[4].Trim());
 
         }
 
-        public MSGMovingTbl(int mti, string u, MovingTable.submessagecode smc, bool cw, float y)
+        public MSGMovingTbl(int mti, string u, MovingTable.subMessageCode smc, bool cw, float y)
         {
             movingTableIndex = mti;
             user = u;
@@ -3943,7 +3943,7 @@ public override void HandleMsg()
                 {
                     switch (subMessageCode)
                     {
-                        case MovingTable.submessagecode.GoToTarget:
+                        case MovingTable.subMessageCode.GoToTarget:
                             turntable.RemotelyControlled = true;
                             if (Math.Abs(MathHelper.WrapAngle(turntable.YAngle - yangle)) > 0.2f)
                             {
@@ -3953,7 +3953,7 @@ public override void HandleMsg()
                             }
                             turntable.GeneralComputeTarget(clockwise);
                             break;
-                        case MovingTable.submessagecode.StartingContinuous:
+                        case MovingTable.subMessageCode.StartingContinuous:
                             turntable.YAngle = yangle;
                             turntable.TargetY = yangle;
                             turntable.AlignToRemote = true;
@@ -3967,7 +3967,7 @@ public override void HandleMsg()
                 {
                     switch (subMessageCode)
                     {
-                        case MovingTable.submessagecode.GoToTarget:
+                        case MovingTable.subMessageCode.GoToTarget:
                             transfertable.RemotelyControlled = true;
                             if (Math.Abs(transfertable.OffsetPos - yangle) > 2.8f)
                             {
@@ -3977,7 +3977,7 @@ public override void HandleMsg()
                             }
                             transfertable.GeneralComputeTarget(clockwise);
                             break;
-                        case MovingTable.submessagecode.StartingContinuous:
+                        case MovingTable.subMessageCode.StartingContinuous:
                             transfertable.OffsetPos = yangle;
                             transfertable.TargetOffset = yangle;
                             transfertable.AlignToRemote = true;

Source/Orts.Simulation/Simulation/Transfertables.cs

@@ -47,7 +47,10 @@ public float CenterOffsetComponent
         {
             get => VerticalTransfer ? CenterOffset.Y : CenterOffset.X;
         }
-        public float OffsetDiff = 1.4f;
+        public float OffsetDiff
+        {
+            get => RemotelyControlled ? 2.8f : 1.4f;
+        }
         // Dynamic data
         public bool Forward; // forward motion on
         public bool Reverse; // reverse motion on
@@ -177,7 +180,7 @@ public override void ComputeTarget(bool isForward)
             if (!Continuous) return;
             if (MultiPlayer.MPManager.IsMultiPlayer())
             {
-                SubMessageCode = submessagecode.GoToTarget;
+                SubMessageCode = subMessageCode.GoToTarget;
                 MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessageCode, isForward, OffsetPos).ToString());
             }
             RemotelyControlled = false;
@@ -191,7 +194,6 @@ public void GeneralComputeTarget(bool isForward)
             GoToTarget = false;
             Forward = isForward;
             Reverse = !isForward;
-            OffsetDiff = RemotelyControlled ? 2.8f : 1.4f;
             if (Forward)
             {
                 Connected = false;
@@ -278,7 +280,7 @@ public override void StartContinuous(bool isForward)
             }
             if (MultiPlayer.MPManager.IsMultiPlayer())
             {
-                SubMessageCode = submessagecode.StartingContinuous;
+                SubMessageCode = subMessageCode.StartingContinuous;
                 MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessageCode, isForward, OffsetPos).ToString());
             }
             GeneralStartContinuous(isForward);

Source/Orts.Simulation/Simulation/Turntables.cs

@@ -81,7 +81,7 @@ public class MovingTable
         protected int[] MyTrVectorSectionsIndex;
         public bool[] MyTrackNodesOrientation { get; protected set; } // true if forward, false if backward
         public int TrackShapeIndex;
-        public enum submessagecode
+        public enum subMessageCode
         {
             GoToTarget,
             StartingContinuous,
@@ -108,7 +108,7 @@ public enum submessagecode
         public Vector3 FinalFrontTravellerXNALocation;
         public Vector3 FinalRearTravellerXNALocation;
         public Simulator Simulator;
-        public submessagecode SubMessageCode;
+        public subMessageCode SubMessageCode;
         public bool AlignToRemote;
         public bool RemotelyControlled;
 
@@ -485,7 +485,7 @@ public override void ComputeTarget(bool isClockwise)
             if (!Continuous) return;
             if (MultiPlayer.MPManager.IsMultiPlayer())
             {
-                SubMessageCode = submessagecode.GoToTarget;
+                SubMessageCode = subMessageCode.GoToTarget;
                 MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessageCode, isClockwise, YAngle).ToString());
             }
             RemotelyControlled = false;
@@ -628,7 +628,7 @@ public override void StartContinuous(bool isClockwise)
             }
             if (MultiPlayer.MPManager.IsMultiPlayer())
             {
-                SubMessageCode = submessagecode.StartingContinuous;
+                SubMessageCode = subMessageCode.StartingContinuous;
                 MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessageCode, isClockwise, YAngle).ToString());
             }
             GeneralStartContinuous(isClockwise);