Merge pull request #1065 from cesarBLG/pantograph-toggle

Fix for PantographToggle sound event

Author: cesarBLG

Source/Documentation/Manual/sound.rst

@@ -101,7 +101,7 @@ Trigger       Function
     44        SteamHeatChange
     45        Pantograph1Up
     46        Pantograph1Down
-    47        Pantograph1Toggle
+    47        PantographToggle
     48        VigilanceAlarmReset
     54        TrainBrakePressureDecrease 
     56        VigilanceAlarmOn
@@ -698,4 +698,4 @@ the sound does not depend from that keyword.
 In the example shown, the sound is played if all conditions are met, that is season 
 is spring or winter and weather is rain and time of day is within one of the two 
 intervals 7-12 or 13-20. There may be as many TimeOfDay lines as wanted, 
-but the granularity is one hour.
+but the granularity is one hour.

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

@@ -3608,7 +3608,6 @@ public override void SignalEvent(PowerSupplyEvent evt)
                         if (Pantographs != null)
                         {
                             Pantographs.HandleEvent(evt);
-                            SignalEvent(Event.PantographToggle);
                         }
                         break;
                 }
@@ -3628,7 +3627,6 @@ public override void SignalEvent(PowerSupplyEvent evt, int id)
                         if (Pantographs != null)
                         {
                             Pantographs.HandleEvent(evt, id);
-                            SignalEvent(Event.PantographToggle);
                         }
                         break;
                 }

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

@@ -386,6 +386,7 @@ public void HandleEvent(PowerSupplyEvent evt)
                     foreach (var eventHandler in Wagon.EventHandlers)
                     {
                         eventHandler.HandleEvent(soundEvent);
+                        eventHandler.HandleEvent(Event.PantographToggle);
                     }
                 }
                 catch (Exception error)