Removed changes in UserCommand, InputSettings and AITrain which caused merge errors.

Author: Roeterdink

Source/ORTS.Common/Input/UserCommand.cs

@@ -80,7 +80,6 @@ public enum UserCommand
         [GetString("Debug Precipitation Decrease")] DebugPrecipitationDecrease,
         [GetString("Debug Precipitation Liquidity Increase")] DebugPrecipitationLiquidityIncrease,
         [GetString("Debug Precipitation Liquidity Decrease")] DebugPrecipitationLiquidityDecrease,
-        [GetString("Debug Request Stop Information")] DebugRequestStopInformation,
         [GetString("Debug Daylight Offset Increase")] DebugDaylightOffsetIncrease,
         [GetString("Debug Daylight Offset Decrease")] DebugDaylightOffsetDecrease,
         [GetString("Debug Weather Change")] DebugWeatherChange,

Source/ORTS.Settings/InputSettings.cs

@@ -490,7 +490,6 @@ static void InitializeCommands(UserCommandInput[] Commands)
             Commands[(int)UserCommand.DebugPrecipitationIncrease] = new UserCommandKeyInput(0x0D, KeyModifiers.Alt);
             Commands[(int)UserCommand.DebugPrecipitationLiquidityDecrease] = new UserCommandKeyInput(0x0C, KeyModifiers.Control | KeyModifiers.Alt);
             Commands[(int)UserCommand.DebugPrecipitationLiquidityIncrease] = new UserCommandKeyInput(0x0D, KeyModifiers.Control | KeyModifiers.Alt);
-            Commands[(int)UserCommand.DebugRequestStopInformation] = new UserCommandKeyInput(0x44, KeyModifiers.Alt);
             Commands[(int)UserCommand.DebugResetWheelSlip] = new UserCommandKeyInput(0x2D, KeyModifiers.Alt);
             Commands[(int)UserCommand.DebugSignalling] = new UserCommandKeyInput(0x57, KeyModifiers.Control | KeyModifiers.Alt);
             Commands[(int)UserCommand.DebugSoundForm] = new UserCommandKeyInput(0x1F, KeyModifiers.Alt);

Source/Orts.Simulation/Simulation/AIs/AITrain.cs

@@ -2061,11 +2061,7 @@ public virtual void UpdateStationState(float elapsedClockSeconds, int presentTim
                     MovementState = AI_MOVEMENT_STATE.STOPPED_EXISTING;
                     if (TrainType != TRAINTYPE.AI_PLAYERHOSTING) AtStation = false;
                 }
-
-                if (thisStation.ArrivalTime >= 0)
-                {
-                    Delay = TimeSpan.FromSeconds((presentTime - thisStation.DepartTime) % (24 * 3600));
-                }
+                Delay = TimeSpan.FromSeconds((presentTime - thisStation.DepartTime) % (24 * 3600));
             }
 
 #if DEBUG_REPORTS

Source/RunActivity/Viewer3D/Viewer.cs

@@ -1173,17 +1173,17 @@ void HandleUserInput(ElapsedTime elapsedTime)
                 Settings.Save();
             }
 
-            //ALT-F10 : display request stop info for player train
-            if (UserInput.IsPressed(UserCommand.DebugRequestStopInformation))
-            {
-                if (PlayerTrain != null)
-                {
-                    if (PlayerTrain.StationStops != null && PlayerTrain.StationStops.Count > 0 && PlayerTrain.StationStops[0].ReqStopDetails != null)
-                    {
-                        PlayerTrain.StationStops[0].ReqStopDetails.displayRQSInfo = true;
-                    }
-                }
-            }
+            //ALT-F10 : display request stop info for player train - to be restored later when user setting can be defined
+            //if (UserInput.IsPressed(UserCommand.DebugRequestStopInformation))
+            //{
+            //    if (PlayerTrain != null)
+            //    {
+            //        if (PlayerTrain.StationStops != null && PlayerTrain.StationStops.Count > 0 && PlayerTrain.StationStops[0].ReqStopDetails != null)
+            //        {
+            //            PlayerTrain.StationStops[0].ReqStopDetails.displayRQSInfo = true;
+            //        }
+            //    }
+            //}
 
             //hit 9 key, get back to player train
             if (UserInput.IsPressed(UserCommand.CameraJumpBackPlayer))