Merge remote-tracking branch 'upstream/master'

Author: Chris Jakeman

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

@@ -207,8 +207,7 @@ Audio Options
 
 .. image:: images/options-audio.png
 
-Except for very slow computers, it is suggested that you leave the *MSTS
-Bin compatible sound* option checked and set the Sound detail level to 5.
+Except for very slow computers, it is suggested that you set the Sound detail level to 5.
 
 The *% sound volume* scroll button allows adjustment of the volume of OR
 sound. Default is 40.

Source/Documentation/Manual/options.rst

@@ -156,8 +156,6 @@ public OptionsForm(UserSettings settings, UpdateManager updateManager, bool init
             numericWebServerPort.Value = Settings.WebServerPort;
 
             // Audio tab
-
-            checkMSTSBINSound.Checked = Settings.MSTSBINSound;
             numericSoundVolumePercent.Value = Settings.SoundVolumePercent;
             numericSoundDetailLevel.Value = Settings.SoundDetailLevel;
             numericExternalSoundPassThruPercent.Value = Settings.ExternalSoundPassThruPercent;
@@ -449,7 +447,6 @@ void buttonOK_Click(object sender, EventArgs e)
             Settings.WebServer = checkEnableWebServer.Checked;
 
             // Audio tab
-            Settings.MSTSBINSound = checkMSTSBINSound.Checked;
             Settings.SoundVolumePercent = (int)numericSoundVolumePercent.Value;
             Settings.SoundDetailLevel = (int)numericSoundDetailLevel.Value;
             Settings.ExternalSoundPassThruPercent = (int)numericExternalSoundPassThruPercent.Value;

Source/Menu/Options.Designer.cs

@@ -273,18 +273,6 @@ public static Event From(bool mstsBinEnabled, Source source, int eventID)
             switch (source)
             {
                 case Source.MSTSCar:
-                    if (mstsBinEnabled)
-                    {
-                        switch (eventID)
-                        {
-                            // MSTSBin codes (documented at http://mstsbin.uktrainsim.com/)
-                            case 23: return Event.EnginePowerOn;
-                            case 24: return Event.EnginePowerOff;
-                            case 66: return Event.Pantograph2Up;
-                            case 67: return Event.Pantograph2Down;
-                            default: break;
-                        }
-                    }
                     switch (eventID)
                     {
                         // Calculated from inspection of existing engine .sms files and extensive testing.
@@ -310,8 +298,9 @@ public static Event From(bool mstsBinEnabled, Source source, int eventID)
                         case 20: return Event.DynamicBrakeChange;
                         case 21: return Event.EngineBrakePressureIncrease; // Event 21 is defined in sound files but never used in MSTS.
                         case 22: return Event.EngineBrakePressureDecrease; // Event 22 is defined in sound files but never used in MSTS.
-                        // Event 23 is unused in MSTS.
-                        // Event 24 is unused in MSTS.
+                        // MSTSBin codes 23, 24 (documented at http://mstsbin.uktrainsim.com/)
+                        case 23: return Event.EnginePowerOn;
+                        case 24: return Event.EnginePowerOff;
                         // Event 25 is possibly a vigilance reset in MSTS sound files but is never used.
                         // Event 26 is a sander toggle in MSTS sound files but is never used.
                         case 27: return Event.WaterInjector2On;
@@ -352,6 +341,9 @@ public static Event From(bool mstsBinEnabled, Source source, int eventID)
                         case 62: return Event.UncoupleB;
                         case 63: return Event.UncoupleC;
                         // Event 64 is unused in MSTS.
+                        // MSTSBin codes 66, 67 (documented at http://mstsbin.uktrainsim.com/)
+                        case 66: return Event.Pantograph2Up;
+                        case 67: return Event.Pantograph2Down;
 
                         // ORTS only Events
                         case 101: return Event.GearUp; // for gearbox based engines