Skip to content

Commit 98221c0

Browse files
committed
Fix merge conflicts
1 parent 9f390fd commit 98221c0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5777,7 +5777,7 @@ public virtual float GetDataOf(CabViewControl cvc)
57775777
case CABViewControlTypes.ORTS_LEFTDOOR:
57785778
case CABViewControlTypes.ORTS_RIGHTDOOR:
57795779
{
5780-
bool right = (cvc.ControlType == CABViewControlTypes.ORTS_RIGHTDOOR) ^ Flipped ^ GetCabFlipped();
5780+
bool right = (cvc.ControlType.Type == CABViewControlTypes.ORTS_RIGHTDOOR) ^ Flipped ^ GetCabFlipped();
57815781
var state = Train.DoorState(right ? DoorSide.Right : DoorSide.Left);
57825782
data = state >= DoorState.Opening ? 1 : 0;
57835783
}

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2487,7 +2487,7 @@ public void HandleUserInput()
24872487
case CABViewControlTypes.ORTS_LEFTDOOR:
24882488
case CABViewControlTypes.ORTS_RIGHTDOOR:
24892489
{
2490-
bool right = (Control.ControlType == CABViewControlTypes.ORTS_RIGHTDOOR) ^ Locomotive.Flipped ^ Locomotive.GetCabFlipped();
2490+
bool right = (Control.ControlType.Type == CABViewControlTypes.ORTS_RIGHTDOOR) ^ Locomotive.Flipped ^ Locomotive.GetCabFlipped();
24912491
var state = Locomotive.Train.DoorState(right ? DoorSide.Right : DoorSide.Left);
24922492
int open = state >= DoorState.Opening ? 1 : 0;
24932493
if (open != ChangedValue(open))
@@ -3313,7 +3313,7 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
33133313
case CABViewControlTypes.LEFTDOOR:
33143314
case CABViewControlTypes.RIGHTDOOR:
33153315
{
3316-
bool right = (p.Value.Type == CABViewControlTypes.RIGHTDOOR) ^ Locomotive.Flipped ^ Locomotive.GetCabFlipped();
3316+
bool right = (p.Value.Type.Type == CABViewControlTypes.RIGHTDOOR) ^ Locomotive.Flipped ^ Locomotive.GetCabFlipped();
33173317
var state = (right ? Locomotive.RightDoor : Locomotive.LeftDoor).State;
33183318
p.Value.UpdateState(state >= DoorState.Opening, elapsedTime);
33193319
}

0 commit comments

Comments
 (0)