Merge branch 'openrails:master' into master

Author: Weter-ORTS

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

@@ -1836,14 +1836,15 @@ public override void Update(float elapsedClockSeconds)
                 if (TendersSteamLocomotive != null)
                 {
                     if (TendersSteamLocomotive.IsTenderRequired == 1)
-                    {
-                        TendersSteamLocomotive.MaxTenderCoalMassKG = TenderWagonMaxCoalMassKG;
-
+                    {                        
                         // Combined total water found by taking the current combined water (which may have extra water added via the auxiliary tender), and subtracting the 
-                        // amount of water defined in the ENG file, and adding the water defiend in the WAG file.
+                        // amount of water defined in the ENG file, and adding the water defined in the WAG file.
                         float TempMaxCombinedWater = TendersSteamLocomotive.MaxTotalCombinedWaterVolumeUKG;
                         TendersSteamLocomotive.MaxTotalCombinedWaterVolumeUKG = (TempMaxCombinedWater - (Kg.ToLb(TendersSteamLocomotive.MaxLocoTenderWaterMassKG) / WaterLBpUKG)) + (Kg.ToLb(TenderWagonMaxWaterMassKG) / WaterLBpUKG);
 
+                        TendersSteamLocomotive.MaxTenderCoalMassKG = TenderWagonMaxCoalMassKG;
+                        TendersSteamLocomotive.MaxLocoTenderWaterMassKG = TenderWagonMaxWaterMassKG;
+
                         if (Simulator.Settings.VerboseConfigurationMessages)
                         {
                             Trace.TraceInformation("Fuel and Water Masses adjusted to Tender Values Specified in WAG File - Coal mass {0} kg, Water Mass {1}", FormatStrings.FormatMass(TendersSteamLocomotive.MaxTenderCoalMassKG, IsMetric), FormatStrings.FormatFuelVolume(L.FromGUK(TendersSteamLocomotive.MaxTotalCombinedWaterVolumeUKG), IsMetric, IsUK));

Source/Orts.Simulation/Simulation/Signalling/Signals.cs

@@ -32,7 +32,6 @@
 using Orts.Parsers.Msts;
 using Orts.Simulation.AIs;
 using Orts.Simulation.Physics;
-using Orts.Simulation.Timetables;
 using ORTS.Common;
 using System;
 using System.Collections.Generic;
@@ -1245,7 +1244,7 @@ private void AddWorldInfo()
             {
                 if (signal != null)
                 {
-                    if (signal.isSignal)
+                    if (signal.isSignal || signal.isSpeedSignal)
                     {
                         foreach (SignalHead head in signal.SignalHeads)
                         {