Merge pull request #471 from peternewell/control-trailer#1

Correct issue with control car wheels not rotating
Blueprint https://blueprints.launchpad.net/or/+spec/unpowered-control-car

Author: cjakeman

Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs

@@ -120,6 +120,7 @@ public override void InitializeMoving()
         public override void Update(float elapsedClockSeconds)
         {
             base.Update(elapsedClockSeconds);
+            WheelSpeedMpS = SpeedMpS; // Set wheel speed for control car, required to make wheels go around.
 
         }
 

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

@@ -2431,17 +2431,16 @@ public void AdvancedAdhesion(float elapsedClockSeconds)
             }
 
             //Curtius-Kniffler computation for the basic model
-    //        float max0 = 1.0f;  //Adhesion conditions [N]
+            //        float max0 = 1.0f;  //Adhesion conditions [N]
 
-            if (EngineType == EngineTypes.Steam && SteamEngineType != MSTSSteamLocomotive.SteamEngineTypes.Geared )
-             {
+            if (EngineType == EngineTypes.Steam && SteamEngineType != MSTSSteamLocomotive.SteamEngineTypes.Geared)
+            {
                 // Steam locomotive details updated in UpdateTractiveForce method, and inserted into adhesion module
                 // ****************  NB WheelSpeed updated within Steam Locomotive module at the moment - to be fixed to prevent discrepancies ******************
             }
-            
-            else 
+            else
             {
-               
+
                 //Compute axle inertia from parameters if possible
                 if (AxleInertiaKgm2 > 10000.0f) // if axleinertia value supplied in ENG file, then use in calculations
                 {
@@ -2476,7 +2475,7 @@ public void AdvancedAdhesion(float elapsedClockSeconds)
                 LocomotiveAxle.DriveForceN = MotiveForceN;              //Total force applied to wheels
                 LocomotiveAxle.TrainSpeedMpS = SpeedMpS;                //Set the train speed of the axle model
                 LocomotiveAxle.Update(elapsedClockSeconds);             //Main updater of the axle model
-         
+
                 // Output
                 MotiveForceN = LocomotiveAxle.CompensatedAxleForceN; //Get the Axle force and use it for the motion (use compensated value as it is independent of brake force)