EOT: follow suggestions of reviewer

openrails · Apr 3, 2022 · f2b6299 · f2b6299
1 parent 80f6486
commit f2b6299
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 29 deletions.
diff --git a/Source/Orts.Simulation/Common/Commands.cs b/Source/Orts.Simulation/Common/Commands.cs
@@ -2242,10 +2242,7 @@ public ToggleEOTEmergencyBrakeCommand(CommandLog log)
 
         public override void Redo()
         {
-            if (Receiver?.Train?.EOT != null)
-            {
-                Receiver.Train.EOT.EmergencyBrake(!Receiver.Train.EOT.EOTEmergencyBrakingOn);
-            }
+            Receiver.Train.EOT?.EmergencyBrake(!Receiver.Train.EOT.EOTEmergencyBrakingOn);
         }
     }
 

diff --git a/Source/Orts.Simulation/Simulation/AIs/AI.cs b/Source/Orts.Simulation/Simulation/AIs/AI.cs
@@ -834,8 +834,6 @@ private AITrain CreateAITrain(Service_Definition sd, Traffic_Traffic_Definition
                 StartList.InsertTrain(train);
                 Simulator.StartReference.Add(train.Number);
             }
-//            if (train.Cars[0] is MSTSLocomotive && (train.Cars[0] as MSTSLocomotive).EOTEnabled != MSTSLocomotive.EOTenabled.no)
-//                    train.EOT = new EOT((train.Cars[0] as MSTSLocomotive).EOTEnabled, true, train);
             return train;
         }
 

diff --git a/Source/Orts.Simulation/Simulation/Physics/Train.cs b/Source/Orts.Simulation/Simulation/Physics/Train.cs
@@ -916,10 +916,6 @@ public Train(Simulator simulator, BinaryReader inf)
             InitialSpeed = inf.ReadSingle();
             IsPathless = inf.ReadBoolean();
 
- /*           var hasEOT = inf.ReadInt32();
-            if (hasEOT == 1)
-                EOT = new EOT(inf, this);*/
-
             if (TrainType != TRAINTYPE.REMOTE)
             {
                 // restore leadlocomotive

diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/EOT.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/EOT.cs
@@ -91,25 +91,6 @@ public EOT(Simulator simulator, string wagPath)
             DelayTimer = new Timer(this);
         }
 
-/*        public EOT(MSTSLocomotive.EOTenabled eotEnabled, bool armed, Train train)
-        {
-            Train = train;
-            EOTState = EOTstate.Disarmed;
-            EOTType = eotEnabled;
-            ID = IDRandom.Next(0, 99999);
-            if (armed)
-                EOTState = EOTstate.Armed;
-            DelayTimer = new Timer(this);
-        }*/
-
- /*       public EOT(BinaryReader inf, Train train)
-        {
-            Train = train;
-            ID = inf.ReadInt32();
-            EOTState = (EOTstate)(inf.ReadInt32());
-            DelayTimer = new Timer(this);
-        }*/
-
         public override void Initialize()
         {
             base.Initialize();