Reverse order of enum

openrails · Dec 20, 2022 · 91bcfa2 · 91bcfa2
1 parent 570ab21
commit 91bcfa2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -5310,7 +5310,7 @@ public virtual float GetDataOf(CabViewControl cvc)
                     {
                         bool right = (cvc.ControlType == CABViewControlTypes.ORTS_RIGHTDOOR) ^ Flipped ^ GetCabFlipped();
                         var state = Train.DoorState(right ? DoorSide.Right : DoorSide.Left);
-                        data = (state == DoorState.Opening || state == DoorState.Open) ? 1 : 0;
+                        data = state >= DoorState.Opening ? 1 : 0;
                     }
                     break;
                 case CABViewControlTypes.ORTS_MIRRORS:

diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Door.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Door.cs
@@ -26,8 +26,8 @@ public enum DoorState
     {
         Closed,
         Closing,
-        Open,
         Opening,
+        Open,
     }
     public enum DoorSide
     {

diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
@@ -2433,7 +2433,7 @@ public void HandleUserInput()
                     {
                         bool right = (Control.ControlType == CABViewControlTypes.ORTS_RIGHTDOOR) ^ Locomotive.Flipped ^ Locomotive.GetCabFlipped();
                         var state = Locomotive.Train.DoorState(right ? DoorSide.Right : DoorSide.Left);
-                        int open = state >= DoorState.Open ? 1 : 0;
+                        int open = state >= DoorState.Opening ? 1 : 0;
                         if (open != ChangedValue(open))
                         {
                             if (right) new ToggleDoorsRightCommand(Viewer.Log);
@@ -3156,7 +3156,7 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
                             {
                                 bool right = (p.Value.Type == CABViewControlTypes.RIGHTDOOR) ^ Locomotive.Flipped ^ Locomotive.GetCabFlipped();
                                 var state = (right ? Locomotive.RightDoor : Locomotive.LeftDoor).State;
-                                p.Value.UpdateState(state >= DoorState.Open, elapsedTime);
+                                p.Value.UpdateState(state >= DoorState.Opening, elapsedTime);
                             }
                             break;
                         case CABViewControlTypes.MIRRORS:

diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
@@ -408,8 +408,8 @@ public MSTSWagonViewer(Viewer viewer, MSTSWagon car)
             Pantograph2.SetState(MSTSWagon.Pantographs[2].CommandUp);
             if (MSTSWagon.Pantographs.List.Count > 2) Pantograph3.SetState(MSTSWagon.Pantographs[3].CommandUp);
             if (MSTSWagon.Pantographs.List.Count > 3) Pantograph4.SetState(MSTSWagon.Pantographs[4].CommandUp);
-            LeftDoor.SetState(MSTSWagon.LeftDoor.State >= DoorState.Open);
-            RightDoor.SetState(MSTSWagon.RightDoor.State >= DoorState.Open);
+            LeftDoor.SetState(MSTSWagon.LeftDoor.State >= DoorState.Opening);
+            RightDoor.SetState(MSTSWagon.RightDoor.State >= DoorState.Opening);
             Mirrors.SetState(MSTSWagon.MirrorOpen);
             Item1TwoState.SetState(MSTSWagon.GenericItem1);
             Item2TwoState.SetState(MSTSWagon.GenericItem2);
@@ -614,8 +614,8 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
             Pantograph2.UpdateState(MSTSWagon.Pantographs[2].CommandUp, elapsedTime);
             if (MSTSWagon.Pantographs.List.Count > 2) Pantograph3.UpdateState(MSTSWagon.Pantographs[3].CommandUp, elapsedTime);
             if (MSTSWagon.Pantographs.List.Count > 3) Pantograph4.UpdateState(MSTSWagon.Pantographs[4].CommandUp, elapsedTime);
-            LeftDoor.UpdateState(MSTSWagon.LeftDoor.State == DoorState.Open || MSTSWagon.LeftDoor.State == DoorState.Opening, elapsedTime);
-            RightDoor.UpdateState(MSTSWagon.RightDoor.State == DoorState.Open || MSTSWagon.RightDoor.State == DoorState.Opening, elapsedTime);
+            LeftDoor.UpdateState(MSTSWagon.LeftDoor.State >= DoorState.Opening, elapsedTime);
+            RightDoor.UpdateState(MSTSWagon.RightDoor.State >= DoorState.Opening, elapsedTime);
             Mirrors.UpdateState(MSTSWagon.MirrorOpen, elapsedTime);
             UnloadingParts.UpdateState(MSTSWagon.UnloadingPartsOpen, elapsedTime);
             Item1TwoState.UpdateState(MSTSWagon.GenericItem1, elapsedTime);