Reposition changes to avoid merge conflicts

Author: Roeterdink

Source/ORTS.Common/Input/UserCommand.cs

@@ -80,6 +80,7 @@ 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,
@@ -96,7 +97,6 @@ public enum UserCommand
         [GetString("Debug Sound Form")] DebugSoundForm,
         [GetString("Debug Physics Form")] DebugPhysicsForm,
         [GetString("Debug Toggle Confirmations")] DebugToggleConfirmations,
-        [GetString("Debug Request Stop Information")] DebugRequestStopInformation,
 
         [GetString("Camera Cab")] CameraCab,
         [GetString("Camera Change Passenger Viewpoint")] CameraChangePassengerViewPoint,

Source/ORTS.Settings/InputSettings.cs

@@ -490,6 +490,7 @@ 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);
@@ -500,7 +501,6 @@ static void InitializeCommands(UserCommandInput[] Commands)
             Commands[(int)UserCommand.DebugTracks] = new UserCommandKeyInput(0x40, KeyModifiers.Control | KeyModifiers.Alt);
             Commands[(int)UserCommand.DebugWeatherChange] = new UserCommandKeyInput(0x19, KeyModifiers.Alt);
             Commands[(int)UserCommand.DebugToggleConfirmations] = new UserCommandKeyInput(0x44, KeyModifiers.Control | KeyModifiers.Alt);
-            Commands[(int)UserCommand.DebugRequestStopInformation] = new UserCommandKeyInput(0x44, KeyModifiers.Alt);
 
             Commands[(int)UserCommand.DisplayTrainListWindow] = new UserCommandKeyInput(0x43, KeyModifiers.Alt);
             Commands[(int)UserCommand.DisplayCarLabels] = new UserCommandModifiableKeyInput(0x41, Commands[(int)UserCommand.DisplayNextWindowTab]);