Fix merge conflicts

Author: cesarBLG

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

@@ -5777,7 +5777,7 @@ public virtual float GetDataOf(CabViewControl cvc)
                 case CABViewControlTypes.ORTS_LEFTDOOR:
                 case CABViewControlTypes.ORTS_RIGHTDOOR:
                     {
-                        bool right = (cvc.ControlType == CABViewControlTypes.ORTS_RIGHTDOOR) ^ Flipped ^ GetCabFlipped();
+                        bool right = (cvc.ControlType.Type == CABViewControlTypes.ORTS_RIGHTDOOR) ^ Flipped ^ GetCabFlipped();
                         var state = Train.DoorState(right ? DoorSide.Right : DoorSide.Left);
                         data = state >= DoorState.Opening ? 1 : 0;
                     }

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

@@ -2487,7 +2487,7 @@ public void HandleUserInput()
                 case CABViewControlTypes.ORTS_LEFTDOOR:
                 case CABViewControlTypes.ORTS_RIGHTDOOR:
                     {
-                        bool right = (Control.ControlType == CABViewControlTypes.ORTS_RIGHTDOOR) ^ Locomotive.Flipped ^ Locomotive.GetCabFlipped();
+                        bool right = (Control.ControlType.Type == CABViewControlTypes.ORTS_RIGHTDOOR) ^ Locomotive.Flipped ^ Locomotive.GetCabFlipped();
                         var state = Locomotive.Train.DoorState(right ? DoorSide.Right : DoorSide.Left);
                         int open = state >= DoorState.Opening ? 1 : 0;
                         if (open != ChangedValue(open))
@@ -3313,7 +3313,7 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
                         case CABViewControlTypes.LEFTDOOR:
                         case CABViewControlTypes.RIGHTDOOR:
                             {
-                                bool right = (p.Value.Type == CABViewControlTypes.RIGHTDOOR) ^ Locomotive.Flipped ^ Locomotive.GetCabFlipped();
+                                bool right = (p.Value.Type.Type == CABViewControlTypes.RIGHTDOOR) ^ Locomotive.Flipped ^ Locomotive.GetCabFlipped();
                                 var state = (right ? Locomotive.RightDoor : Locomotive.LeftDoor).State;
                                 p.Value.UpdateState(state >= DoorState.Opening, elapsedTime);
                             }