Skip to content

Commit 91bcfa2

Browse files
committed
Reverse order of enum
1 parent 570ab21 commit 91bcfa2

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5310,7 +5310,7 @@ public virtual float GetDataOf(CabViewControl cvc)
53105310
{
53115311
bool right = (cvc.ControlType == CABViewControlTypes.ORTS_RIGHTDOOR) ^ Flipped ^ GetCabFlipped();
53125312
var state = Train.DoorState(right ? DoorSide.Right : DoorSide.Left);
5313-
data = (state == DoorState.Opening || state == DoorState.Open) ? 1 : 0;
5313+
data = state >= DoorState.Opening ? 1 : 0;
53145314
}
53155315
break;
53165316
case CABViewControlTypes.ORTS_MIRRORS:

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Door.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public enum DoorState
2626
{
2727
Closed,
2828
Closing,
29-
Open,
3029
Opening,
30+
Open,
3131
}
3232
public enum DoorSide
3333
{

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2433,7 +2433,7 @@ public void HandleUserInput()
24332433
{
24342434
bool right = (Control.ControlType == CABViewControlTypes.ORTS_RIGHTDOOR) ^ Locomotive.Flipped ^ Locomotive.GetCabFlipped();
24352435
var state = Locomotive.Train.DoorState(right ? DoorSide.Right : DoorSide.Left);
2436-
int open = state >= DoorState.Open ? 1 : 0;
2436+
int open = state >= DoorState.Opening ? 1 : 0;
24372437
if (open != ChangedValue(open))
24382438
{
24392439
if (right) new ToggleDoorsRightCommand(Viewer.Log);
@@ -3156,7 +3156,7 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
31563156
{
31573157
bool right = (p.Value.Type == CABViewControlTypes.RIGHTDOOR) ^ Locomotive.Flipped ^ Locomotive.GetCabFlipped();
31583158
var state = (right ? Locomotive.RightDoor : Locomotive.LeftDoor).State;
3159-
p.Value.UpdateState(state >= DoorState.Open, elapsedTime);
3159+
p.Value.UpdateState(state >= DoorState.Opening, elapsedTime);
31603160
}
31613161
break;
31623162
case CABViewControlTypes.MIRRORS:

Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -408,8 +408,8 @@ from data in effect.Value
408408
Pantograph2.SetState(MSTSWagon.Pantographs[2].CommandUp);
409409
if (MSTSWagon.Pantographs.List.Count > 2) Pantograph3.SetState(MSTSWagon.Pantographs[3].CommandUp);
410410
if (MSTSWagon.Pantographs.List.Count > 3) Pantograph4.SetState(MSTSWagon.Pantographs[4].CommandUp);
411-
LeftDoor.SetState(MSTSWagon.LeftDoor.State >= DoorState.Open);
412-
RightDoor.SetState(MSTSWagon.RightDoor.State >= DoorState.Open);
411+
LeftDoor.SetState(MSTSWagon.LeftDoor.State >= DoorState.Opening);
412+
RightDoor.SetState(MSTSWagon.RightDoor.State >= DoorState.Opening);
413413
Mirrors.SetState(MSTSWagon.MirrorOpen);
414414
Item1TwoState.SetState(MSTSWagon.GenericItem1);
415415
Item2TwoState.SetState(MSTSWagon.GenericItem2);
@@ -614,8 +614,8 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
614614
Pantograph2.UpdateState(MSTSWagon.Pantographs[2].CommandUp, elapsedTime);
615615
if (MSTSWagon.Pantographs.List.Count > 2) Pantograph3.UpdateState(MSTSWagon.Pantographs[3].CommandUp, elapsedTime);
616616
if (MSTSWagon.Pantographs.List.Count > 3) Pantograph4.UpdateState(MSTSWagon.Pantographs[4].CommandUp, elapsedTime);
617-
LeftDoor.UpdateState(MSTSWagon.LeftDoor.State == DoorState.Open || MSTSWagon.LeftDoor.State == DoorState.Opening, elapsedTime);
618-
RightDoor.UpdateState(MSTSWagon.RightDoor.State == DoorState.Open || MSTSWagon.RightDoor.State == DoorState.Opening, elapsedTime);
617+
LeftDoor.UpdateState(MSTSWagon.LeftDoor.State >= DoorState.Opening, elapsedTime);
618+
RightDoor.UpdateState(MSTSWagon.RightDoor.State >= DoorState.Opening, elapsedTime);
619619
Mirrors.UpdateState(MSTSWagon.MirrorOpen, elapsedTime);
620620
UnloadingParts.UpdateState(MSTSWagon.UnloadingPartsOpen, elapsedTime);
621621
Item1TwoState.UpdateState(MSTSWagon.GenericItem1, elapsedTime);

0 commit comments

Comments
 (0)