Merge pull request #598 from cjakeman/menu-options02k

02k: Removed menu option Override non-electrified route line-voltage

Author: cjakeman

Source/Documentation/Manual/options.rst

@@ -375,10 +375,6 @@ displayed as a message. This option is described in detail
 :ref:`here <physics-curve-speed-limit-application>` (OR application).
 OR does not display the damage.
 
-Run electric locos on non-electrified routes
---------------------------------------------
-
-This option allows the running of electric locomotives on non-electrified routes.
 
 Steam locomotive hot start
 --------------------------

Source/Menu/Options.Designer.cs

@@ -188,7 +188,6 @@ public OptionsForm(UserSettings settings, UpdateManager updateManager, bool init
             numericAdhesionMovingAverageFilterSize.Value = Settings.AdhesionMovingAverageFilterSize;
             checkBreakCouplers.Checked = Settings.BreakCouplers;
             checkCurveSpeedDependent.Checked = Settings.CurveSpeedDependent;
-            checkOverrideNonElectrifiedRoutes.Checked = Settings.OverrideNonElectrifiedRoutes;
             checkHotStart.Checked = Settings.HotStart;
             checkForcedRedAtStationStops.Checked = !Settings.NoForcedRedAtStationStops;
             checkDoorsAITrains.Checked = Settings.OpenDoorsInAITrains;
@@ -463,7 +462,6 @@ void buttonOK_Click(object sender, EventArgs e)
             Settings.AdhesionMovingAverageFilterSize = (int)numericAdhesionMovingAverageFilterSize.Value;
             Settings.BreakCouplers = checkBreakCouplers.Checked;
             Settings.CurveSpeedDependent = checkCurveSpeedDependent.Checked;
-            Settings.OverrideNonElectrifiedRoutes = checkOverrideNonElectrifiedRoutes.Checked;
             Settings.HotStart = checkHotStart.Checked;
             Settings.NoForcedRedAtStationStops = !checkForcedRedAtStationStops.Checked;
             Settings.OpenDoorsInAITrains = checkDoorsAITrains.Checked;

Source/Menu/Options.cs

@@ -240,8 +240,6 @@ public enum DirectXFeature
         public bool TunnelResistanceDependent { get; set; }
         [Default(false)]
         public bool WindResistanceDependent { get; set; }
-        [Default(false)]
-        public bool OverrideNonElectrifiedRoutes { get; set; }
         [Default(true)]
         public bool HotStart { get; set; }
         [Default(false)]

Source/ORTS.Settings/UserSettings.cs

@@ -109,9 +109,6 @@ public override void Restore(BinaryReader inf)
 
         public override void Initialize()
         {
-            if (!ElectricPowerSupply.RouteElectrified)
-                Trace.WriteLine("Warning: The route is not electrified. Electric driven trains will not run!");
-
             base.Initialize();
 
             // If DrvWheelWeight is not in ENG file, then calculate drivewheel weight freom FoA

Source/Orts.Simulation/Simulation/RollingStocks/MSTSElectricLocomotive.cs

@@ -34,7 +34,6 @@ public class ScriptedDualModePowerSupply : ScriptedLocomotivePowerSupply
         public bool Activated = false;
         private DualModePowerSupply Script => AbstractScript as DualModePowerSupply;
 
-        public bool RouteElectrified => Simulator.TRK.Tr_RouteFile.Electrified || Simulator.Settings.OverrideNonElectrifiedRoutes;
         public float LineVoltageV => (float)Simulator.TRK.Tr_RouteFile.MaxLineVoltage;
         public float PantographVoltageV { get; set; }
         public float FilterVoltageV { get; set; } = 0;

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DualModePowerSupply.cs

@@ -34,7 +34,6 @@ public class ScriptedElectricPowerSupply : ScriptedLocomotivePowerSupply
         public bool Activated = false;
         private ElectricPowerSupply Script => AbstractScript as ElectricPowerSupply;
 
-        public bool RouteElectrified => Simulator.TRK.Tr_RouteFile.Electrified || Simulator.Settings.OverrideNonElectrifiedRoutes;
         public float LineVoltageV => (float)Simulator.TRK.Tr_RouteFile.MaxLineVoltage;
         public float PantographVoltageV { get; set; }
         public float FilterVoltageV { get; set; } = 0;

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ElectricPowerSupply.cs

@@ -366,11 +366,8 @@ public void HandleEvent(PowerSupplyEvent evt)
                                 break;
                         }
 
-
                         if (!Simulator.TRK.Tr_RouteFile.Electrified)
-                            Simulator.Confirmer.Warning(Simulator.Catalog.GetString("No power line!"));
-                        if (Simulator.Settings.OverrideNonElectrifiedRoutes)
-                            Simulator.Confirmer.Information(Simulator.Catalog.GetString("Power line condition overridden."));
+                            Simulator.Confirmer.Information(Simulator.Catalog.GetString("Pantograph raised even though this route is not electrified"));
                     }
                     break;
             }