Skip to content

Commit 6c3c286

Browse files
committed
Code simplification
1 parent f786fff commit 6c3c286

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

Source/RunActivity/Viewer3D/Popups/HUDWindow.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
using Orts.Simulation.AIs;
2424
using Orts.Simulation.Physics;
2525
using Orts.Simulation.RollingStocks;
26+
using Orts.Simulation.RollingStocks.SubSystems;
2627
using Orts.Simulation.RollingStocks.SubSystems.Brakes;
2728
using Orts.Simulation.RollingStocks.SubSystems.Brakes.MSTS;
2829
using Orts.Simulation.RollingStocks.SubSystems.PowerSupplies;
@@ -481,10 +482,8 @@ void TextPageCommon(TableData table)
481482
TableAddLine(table, Viewer.Catalog.GetString("Sander on") + "???");
482483
}
483484

484-
var doorLeftState = Viewer.PlayerLocomotive.Train.GetDoorState(false);
485-
var doorRightState = Viewer.PlayerLocomotive.Train.GetDoorState(true);
486-
var doorLeftOpen = doorLeftState != Simulation.RollingStocks.SubSystems.DoorState.Closed;
487-
var doorRightOpen = doorRightState != Simulation.RollingStocks.SubSystems.DoorState.Closed;
485+
var doorLeftOpen = Viewer.PlayerLocomotive.Train.GetDoorState(false) != DoorState.Closed;
486+
var doorRightOpen = Viewer.PlayerLocomotive.Train.GetDoorState(true) != DoorState.Closed;
488487
if (doorLeftOpen || doorRightOpen)
489488
{
490489
var color = Math.Abs(Viewer.PlayerLocomotive.SpeedMpS) > 0.1f ? "!!!" : "???";

Source/RunActivity/Viewer3D/Popups/TrainDrivingWindow.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,10 +1315,8 @@ void AddSeparator() => AddLabel(new ListLabel
13151315

13161316
// Doors
13171317
var wagon = (MSTSWagon)locomotive;
1318-
var doorLeftState = train.GetDoorState(false);
1319-
var doorRightState = train.GetDoorState(true);
1320-
var doorLeftOpen = doorLeftState != Simulation.RollingStocks.SubSystems.DoorState.Closed;
1321-
var doorRightOpen = doorRightState != Simulation.RollingStocks.SubSystems.DoorState.Closed;
1318+
var doorLeftOpen = train.GetDoorState(false) != DoorState.Closed;
1319+
var doorRightOpen = train.GetDoorState(true) != DoorState.Closed;
13221320
if (doorLeftOpen || doorRightOpen)
13231321
{
13241322
var status = new List<string>();

Source/RunActivity/Viewer3D/WebServices/TrainDrivingDisplay.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
using Orts.Simulation.Physics;
1919
using Orts.Simulation.RollingStocks;
20+
using Orts.Simulation.RollingStocks.SubSystems;
2021
using Orts.Simulation.RollingStocks.SubSystems.Brakes;
2122
using ORTS.Common;
2223
using ORTS.Common.Input;
@@ -770,10 +771,8 @@ void AddSeparator() => AddLabel(new ListLabel
770771

771772
// Doors
772773
var wagon = (MSTSWagon)locomotive;
773-
var doorLeftState = train.GetDoorState(false);
774-
var doorRightState = train.GetDoorState(true);
775-
var doorLeftOpen = doorLeftState != Simulation.RollingStocks.SubSystems.DoorState.Closed;
776-
var doorRightOpen = doorRightState != Simulation.RollingStocks.SubSystems.DoorState.Closed;
774+
var doorLeftOpen = train.GetDoorState(false) != DoorState.Closed;
775+
var doorRightOpen = train.GetDoorState(true) != DoorState.Closed;
777776
if (doorLeftOpen || doorRightOpen)
778777
{
779778
var status = new List<string>();

0 commit comments

Comments
 (0)