Merge pull request #504 from openrails/release/1.4

Merge pull request #502 from peternewell/air-compressor#1

Author: Sharpe49

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

@@ -2311,7 +2311,7 @@ protected virtual void UpdateCompressor(float elapsedClockSeconds)
         {
 
             if (CompressorIsMechanical && (EngineType == EngineTypes.Control || EngineType == EngineTypes.Diesel))
-            {                
+            {
                 // For a mechanical compressor (typically fitted to a diesel locomotive) the charging rate will be related to the RpM of the diesel engine, and therefore 
                 // derated by an amount equivalent to the diesel RpM.
                 // All other locomotive types it will be the full charging rate for the reservoir
@@ -2325,17 +2325,37 @@ protected virtual void UpdateCompressor(float elapsedClockSeconds)
                     if (ControlActiveLocomotive != null)
                     {
                         var activeloco = ControlActiveLocomotive as MSTSDieselLocomotive;
+
+                        // Compressors only operate when the diesel engine is running, otherwise they are off
+                        if (activeloco.DieselEngines[0].State == DieselEngineState.Running && !CompressorIsOn)
+                            SignalEvent(Event.CompressorOn);
+                        else if (activeloco.DieselEngines[0].State != DieselEngineState.Running && CompressorIsOn)
+                            SignalEvent(Event.CompressorOff);
+
+                        // Set charging rate depending upon compressor rpm
                         reservoirChargingRate = (activeloco.DieselEngines[0].RealRPM / activeloco.DieselEngines[0].MaxRPM) * MainResChargingRatePSIpS;
                     }
                 }
                 else
                 {
                     // Powered locomotive use thereselves
                     var mstsDieselLocomotive = this as MSTSDieselLocomotive;
+
+                    // Compressors only operate when the diesel engine is running, otherwise they are off
+                    if (mstsDieselLocomotive.DieselEngines[0].State == DieselEngineState.Running && !CompressorIsOn)
+                        SignalEvent(Event.CompressorOn);
+                    else if (mstsDieselLocomotive.DieselEngines[0].State != DieselEngineState.Running && CompressorIsOn)
+                        SignalEvent(Event.CompressorOff);
+
+                    // Set charging rate depending upon compressor rpm
                     reservoirChargingRate = (mstsDieselLocomotive.DieselEngines[0].RealRPM / mstsDieselLocomotive.DieselEngines[0].MaxRPM) * MainResChargingRatePSIpS;
                 }
 
-                MainResPressurePSI += elapsedClockSeconds * reservoirChargingRate;
+                // Only change reservoir pressure if compressor is running
+                if (CompressorIsOn)
+                {
+                    MainResPressurePSI += elapsedClockSeconds * reservoirChargingRate;
+                }
 
                 // Compressor runs continuously, and excess air pressure is exhausted to atmosphere once max pressure is reached.
                 MainResPressurePSI = MathHelper.Clamp(MainResPressurePSI, 0.0f, MaxMainResPressurePSI);

Source/RunActivity/Viewer3D/Popups/HUDWindow.cs

@@ -848,17 +848,6 @@ void TextPageBrakeInfo(TableData table)
                             car.CarID
                             ));
                         }
-                        else if ((car as MSTSLocomotive).CompressorIsMechanical)
-                        {
-                            // Mechanical compressor run continuously so no point having on and off indication.
-                            TableAddLines(table, String.Format("{0}\t{1}\t{2}\t\t{3}",
-                            Viewer.Catalog.GetString("Loco"),
-                            car.CarID,
-
-                            Viewer.Catalog.GetString("Main reservoir"),
-                            FormatStrings.FormatPressure((car as MSTSLocomotive).MainResPressurePSI, PressureUnit.PSI, (car as MSTSLocomotive).BrakeSystemPressureUnits[BrakeSystemComponent.MainReservoir], true)));
-                        
-                        }
                         else
                         {
                             TableAddLines(table, String.Format("{0}\t{1}\t{2}\t\t{3}\t{4}\t\t{5}",