Further code cleanup

Csantucci · Csantucci · commit 3399d4b7da17 · 2022-08-17T22:02:27.000+02:00
diff --git a/Source/Orts.Simulation/MultiPlayer/Message.cs b/Source/Orts.Simulation/MultiPlayer/Message.cs
@@ -3901,7 +3901,7 @@ public override string ToString()
     public class MSGMovingTbl : Message
     {
         private string user;
-        private MovingTable.subMessageCode subMessageCode;
+        private MovingTable.SubMessageCode subMessageCode;
         private int movingTableIndex;
         private bool clockwise;
         private float yangle;
@@ -3912,13 +3912,13 @@ public MSGMovingTbl(string m)
 
             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;
diff --git a/Source/Orts.Simulation/Simulation/Transfertables.cs b/Source/Orts.Simulation/Simulation/Transfertables.cs
@@ -180,8 +180,8 @@ public override void ComputeTarget(bool isForward)
             if (!Continuous) return;
             if (MultiPlayer.MPManager.IsMultiPlayer())
             {
-                SubMessageCode = subMessageCode.GoToTarget;
-                MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessageCode, isForward, OffsetPos).ToString());
+                SubMessCode = SubMessageCode.GoToTarget;
+                MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessCode, isForward, OffsetPos).ToString());
             }
             RemotelyControlled = false;
             GeneralComputeTarget(isForward);
@@ -280,8 +280,8 @@ public override void StartContinuous(bool isForward)
             }
             if (MultiPlayer.MPManager.IsMultiPlayer())
             {
-                SubMessageCode = subMessageCode.StartingContinuous;
-                MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessageCode, isForward, OffsetPos).ToString());
+                SubMessCode = SubMessageCode.StartingContinuous;
+                MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessCode, isForward, OffsetPos).ToString());
             }
             GeneralStartContinuous(isForward);
         }
diff --git a/Source/Orts.Simulation/Simulation/Turntables.cs b/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 SubMessCode;
         public bool AlignToRemote;
         public bool RemotelyControlled;
 
@@ -485,8 +485,8 @@ public override void ComputeTarget(bool isClockwise)
             if (!Continuous) return;
             if (MultiPlayer.MPManager.IsMultiPlayer())
             {
-                SubMessageCode = subMessageCode.GoToTarget;
-                MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessageCode, isClockwise, YAngle).ToString());
+                SubMessCode = SubMessageCode.GoToTarget;
+                MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessCode, isClockwise, YAngle).ToString());
             }
             RemotelyControlled = false;
             GeneralComputeTarget(isClockwise);
@@ -628,8 +628,8 @@ public override void StartContinuous(bool isClockwise)
             }
             if (MultiPlayer.MPManager.IsMultiPlayer())
             {
-                SubMessageCode = subMessageCode.StartingContinuous;
-                MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessageCode, isClockwise, YAngle).ToString());
+                SubMessCode = SubMessageCode.StartingContinuous;
+                MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessCode, isClockwise, YAngle).ToString());
             }
             GeneralStartContinuous(isClockwise);
         }

Original file line number	Diff line number	Diff line change
`@@ -3901,7 +3901,7 @@ public override string ToString()`
`3901`	`3901`	`public class MSGMovingTbl : Message`
`3902`	`3902`	`{`
`3903`	`3903`	`private string user;`
`3904`		`- private MovingTable.subMessageCode subMessageCode;`
	`3904`	`+ private MovingTable.SubMessageCode subMessageCode;`
`3905`	`3905`	`private int movingTableIndex;`
`3906`	`3906`	`private bool clockwise;`
`3907`	`3907`	`private float yangle;`
`@@ -3912,13 +3912,13 @@ public MSGMovingTbl(string m)`
`3912`	`3912`
`3913`	`3913`	`movingTableIndex = int.Parse(areas[0].Trim());`
`3914`	`3914`	`user = areas[1].Trim();`
`3915`		`- subMessageCode = (MovingTable.subMessageCode)int.Parse(areas[2].Trim());`
	`3915`	`+ subMessageCode = (MovingTable.SubMessageCode)int.Parse(areas[2].Trim());`
`3916`	`3916`	`clockwise = int.Parse(areas[3].Trim()) == 0 ? false : true;`
`3917`	`3917`	`yangle = float.Parse(areas[4].Trim());`
`3918`	`3918`
`3919`	`3919`	`}`
`3920`	`3920`
`3921`		`- public MSGMovingTbl(int mti, string u, MovingTable.subMessageCode smc, bool cw, float y)`
	`3921`	`+ public MSGMovingTbl(int mti, string u, MovingTable.SubMessageCode smc, bool cw, float y)`
`3922`	`3922`	`{`
`3923`	`3923`	`movingTableIndex = mti;`
`3924`	`3924`	`user = u;`
`@@ -3943,7 +3943,7 @@ public override void HandleMsg()`
`3943`	`3943`	`{`
`3944`	`3944`	`switch (subMessageCode)`
`3945`	`3945`	`{`
`3946`		`- case MovingTable.subMessageCode.GoToTarget:`
	`3946`	`+ case MovingTable.SubMessageCode.GoToTarget:`
`3947`	`3947`	`turntable.RemotelyControlled = true;`
`3948`	`3948`	`if (Math.Abs(MathHelper.WrapAngle(turntable.YAngle - yangle)) > 0.2f)`
`3949`	`3949`	`{`
`@@ -3953,7 +3953,7 @@ public override void HandleMsg()`
`3953`	`3953`	`}`
`3954`	`3954`	`turntable.GeneralComputeTarget(clockwise);`
`3955`	`3955`	`break;`
`3956`		`- case MovingTable.subMessageCode.StartingContinuous:`
	`3956`	`+ case MovingTable.SubMessageCode.StartingContinuous:`
`3957`	`3957`	`turntable.YAngle = yangle;`
`3958`	`3958`	`turntable.TargetY = yangle;`
`3959`	`3959`	`turntable.AlignToRemote = true;`
`@@ -3967,7 +3967,7 @@ public override void HandleMsg()`
`3967`	`3967`	`{`
`3968`	`3968`	`switch (subMessageCode)`
`3969`	`3969`	`{`
`3970`		`- case MovingTable.subMessageCode.GoToTarget:`
	`3970`	`+ case MovingTable.SubMessageCode.GoToTarget:`
`3971`	`3971`	`transfertable.RemotelyControlled = true;`
`3972`	`3972`	`if (Math.Abs(transfertable.OffsetPos - yangle) > 2.8f)`
`3973`	`3973`	`{`
`@@ -3977,7 +3977,7 @@ public override void HandleMsg()`
`3977`	`3977`	`}`
`3978`	`3978`	`transfertable.GeneralComputeTarget(clockwise);`
`3979`	`3979`	`break;`
`3980`		`- case MovingTable.subMessageCode.StartingContinuous:`
	`3980`	`+ case MovingTable.SubMessageCode.StartingContinuous:`
`3981`	`3981`	`transfertable.OffsetPos = yangle;`
`3982`	`3982`	`transfertable.TargetOffset = yangle;`
`3983`	`3983`	`transfertable.AlignToRemote = true;`
Original file line number	Diff line number	Diff line change
`@@ -180,8 +180,8 @@ public override void ComputeTarget(bool isForward)`
`180`	`180`	`if (!Continuous) return;`
`181`	`181`	`if (MultiPlayer.MPManager.IsMultiPlayer())`
`182`	`182`	`{`
`183`		`- SubMessageCode = subMessageCode.GoToTarget;`
`184`		`- MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessageCode, isForward, OffsetPos).ToString());`
	`183`	`+ SubMessCode = SubMessageCode.GoToTarget;`
	`184`	`+ MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessCode, isForward, OffsetPos).ToString());`
`185`	`185`	`}`
`186`	`186`	`RemotelyControlled = false;`
`187`	`187`	`GeneralComputeTarget(isForward);`
`@@ -280,8 +280,8 @@ public override void StartContinuous(bool isForward)`
`280`	`280`	`}`
`281`	`281`	`if (MultiPlayer.MPManager.IsMultiPlayer())`
`282`	`282`	`{`
`283`		`- SubMessageCode = subMessageCode.StartingContinuous;`
`284`		`- MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessageCode, isForward, OffsetPos).ToString());`
	`283`	`+ SubMessCode = SubMessageCode.StartingContinuous;`
	`284`	`+ MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessCode, isForward, OffsetPos).ToString());`
`285`	`285`	`}`
`286`	`286`	`GeneralStartContinuous(isForward);`
`287`	`287`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public class MovingTable`
`81`	`81`	`protected int[] MyTrVectorSectionsIndex;`
`82`	`82`	`public bool[] MyTrackNodesOrientation { get; protected set; } // true if forward, false if backward`
`83`	`83`	`public int TrackShapeIndex;`
`84`		`- public enum subMessageCode`
	`84`	`+ public enum SubMessageCode`
`85`	`85`	`{`
`86`	`86`	`GoToTarget,`
`87`	`87`	`StartingContinuous,`
`@@ -108,7 +108,7 @@ public enum subMessageCode`
`108`	`108`	`public Vector3 FinalFrontTravellerXNALocation;`
`109`	`109`	`public Vector3 FinalRearTravellerXNALocation;`
`110`	`110`	`public Simulator Simulator;`
`111`		`- public subMessageCode SubMessageCode;`
	`111`	`+ public SubMessageCode SubMessCode;`
`112`	`112`	`public bool AlignToRemote;`
`113`	`113`	`public bool RemotelyControlled;`
`114`	`114`
`@@ -485,8 +485,8 @@ public override void ComputeTarget(bool isClockwise)`
`485`	`485`	`if (!Continuous) return;`
`486`	`486`	`if (MultiPlayer.MPManager.IsMultiPlayer())`
`487`	`487`	`{`
`488`		`- SubMessageCode = subMessageCode.GoToTarget;`
`489`		`- MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessageCode, isClockwise, YAngle).ToString());`
	`488`	`+ SubMessCode = SubMessageCode.GoToTarget;`
	`489`	`+ MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessCode, isClockwise, YAngle).ToString());`
`490`	`490`	`}`
`491`	`491`	`RemotelyControlled = false;`
`492`	`492`	`GeneralComputeTarget(isClockwise);`
`@@ -628,8 +628,8 @@ public override void StartContinuous(bool isClockwise)`
`628`	`628`	`}`
`629`	`629`	`if (MultiPlayer.MPManager.IsMultiPlayer())`
`630`	`630`	`{`
`631`		`- SubMessageCode = subMessageCode.StartingContinuous;`
`632`		`- MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessageCode, isClockwise, YAngle).ToString());`
	`631`	`+ SubMessCode = SubMessageCode.StartingContinuous;`
	`632`	`+ MultiPlayer.MPManager.Notify(new MultiPlayer.MSGMovingTbl(Simulator.ActiveMovingTableIndex, Orts.MultiPlayer.MPManager.GetUserName(), SubMessCode, isClockwise, YAngle).ToString());`
`633`	`633`	`}`
`634`	`634`	`GeneralStartContinuous(isClockwise);`
`635`	`635`	`}`