Removed option checkFastFullScreenAltTab.

Also finalised previous commit for MSTSBinSound.

Author: Chris Jakeman

Source/Documentation/Manual/images/options-video.png

@@ -242,22 +242,6 @@ Note: This may reduce the frame rate.
 Note: Static objects provided with shadows (in the file <route>.ref) 
 will cast shadows anyway. This option adds shadows for other static objects.
 
-
-.. _options-fullscreen:
-
-Fast full-screen Alt+Tab
-------------------------
-
-When this option is selected, and OR is running full-screen, pressing
-Alt+Tab leaves OR full-screen and running, and allows the
-:ref:`Dispatcher Window <driving-dispatcher>` to be shown in front of it. 
-If this option is not selected, OR is minimized. 
-Each successive press of Alt+Tab will toggle between the map window
-and the OR window.
-
-Note: To display the Map Window, the :ref:`Map window option <options-map-window>` 
-must also be selected and the Map Window started with Ctrl+9.
-
 Glass on in-game windows
 ------------------------
 

Source/Documentation/Manual/options.rst

@@ -163,7 +163,6 @@ public OptionsForm(UserSettings settings, UpdateManager updateManager, bool init
             // Video tab
             checkDynamicShadows.Checked = Settings.DynamicShadows;
             checkShadowAllShapes.Checked = Settings.ShadowAllShapes;
-            checkFastFullScreenAltTab.Checked = Settings.FastFullScreenAltTab;
             checkWindowGlass.Checked = Settings.WindowGlass;
             checkModelInstancing.Checked = Settings.ModelInstancing;
             checkWire.Checked = Settings.Wire;
@@ -454,7 +453,6 @@ void buttonOK_Click(object sender, EventArgs e)
             // Video tab
             Settings.DynamicShadows = checkDynamicShadows.Checked;
             Settings.ShadowAllShapes = checkShadowAllShapes.Checked;
-            Settings.FastFullScreenAltTab = checkFastFullScreenAltTab.Checked;
             Settings.WindowGlass = checkWindowGlass.Checked;
             Settings.ModelInstancing = checkModelInstancing.Checked;
             Settings.Wire = checkWire.Checked;

Source/Menu/Options.Designer.cs

@@ -120,6 +120,9 @@
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="bindingSourceContent.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>114, 17</value>
   </metadata>

Source/Menu/Options.cs

@@ -186,8 +186,6 @@ public enum DirectXFeature
         public bool DisableTCSScripts { get; set; }
 
         // Audio settings:
-        [Default(true)]
-        public bool MSTSBINSound { get; set; }
         [Default(100)]
         public int SoundVolumePercent { get; set; }
         [Default(5)]
@@ -201,8 +199,6 @@ public enum DirectXFeature
         [Default(false)]
         public bool ShadowAllShapes { get; set; }
         [Default(false)]
-        public bool FastFullScreenAltTab { get; set; }
-        [Default(false)]
         public bool WindowGlass { get; set; }
         [Default(false)]
         public bool ModelInstancing { get; set; }

Source/Menu/Options.resx

@@ -268,7 +268,7 @@ public enum Source
         // MSTS/MSTSBin behaviour whenever possible. NEVER return values for
         // non-MSTS events when passed an MSTS Source.
 
-        public static Event From(bool mstsBinEnabled, Source source, int eventID)
+        public static Event From(Source source, int eventID)
         {
             switch (source)
             {

Source/ORTS.Settings/UserSettings.cs

@@ -100,7 +100,7 @@ internal RenderProcess(Game game)
             GraphicsDeviceManager.PreferredDepthStencilFormat = DepthFormat.Depth24Stencil8;
             GraphicsDeviceManager.IsFullScreen = Game.Settings.FullScreen;
             GraphicsDeviceManager.PreferMultiSampling = (AntiAliasingMethod)Game.Settings.AntiAliasing != AntiAliasingMethod.None;
-            GraphicsDeviceManager.HardwareModeSwitch = !Game.Settings.FastFullScreenAltTab;
+            GraphicsDeviceManager.HardwareModeSwitch = false; // for fast full-screen Alt-Tab switching
             GraphicsDeviceManager.PreparingDeviceSettings += new EventHandler<PreparingDeviceSettingsEventArgs>(GDM_PreparingDeviceSettings);
         }
 

Source/Orts.Simulation/Common/Events.cs

@@ -1620,7 +1620,7 @@ public class ORTSDiscreteTrigger: ORTSTrigger, Orts.Common.EventHandler
 
         public ORTSDiscreteTrigger(SoundStream soundStream, Events.Source eventSound, Orts.Formats.Msts.Discrete_Trigger smsData, UserSettings settings)
         {
-            TriggerID = Events.From(settings.MSTSBINSound, eventSound, smsData.TriggerID);
+            TriggerID = Events.From(eventSound, smsData.TriggerID);
             SoundCommand = ORTSSoundCommand.FromMSTS(smsData.SoundCommand, soundStream);
             SoundStream = soundStream;
         }