Correct issues with gear controls not being passed to other locomotives

Author: peternewell

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

@@ -185,47 +185,50 @@ public override void Update(float elapsedClockSeconds)
             WheelSpeedMpS = SpeedMpS; // Set wheel speed for control car, required to make wheels go around.
 
 
-            if (ControllerNumberOfGears > 0 && IsLeadLocomotive())
+            if (ControllerNumberOfGears > 0 && IsLeadLocomotive() && GearBoxController != null)
             {
-                // pass gearbox command key to other locomotives in train, don't treat the player locomotive in this fashion.
+                // Pass gearbox command key to other locomotives in train, don't treat the player locomotive in this fashion.
+                // This assumes that Contol cars have been "matched" with motor cars. Also return values will be on thebasis of the last motor car in the train.         
+
                 foreach (TrainCar car in Train.Cars)
                 {
-
-
                     var locog = car as MSTSDieselLocomotive;
 
-                    if (locog != null && car != this && !locog.IsLeadLocomotive() && GearBoxController != null)
+                    if (locog != null && car != this && !locog.IsLeadLocomotive() && (ControlGearDown || ControlGearUp))
                     {
 
                         if (ControlGearUp)
                         {
-                         
+
                             locog.GearBoxController.CurrentNotch = GearBoxController.CurrentNotch;
                             locog.GearBoxController.SetValue((float)locog.GearBoxController.CurrentNotch);
 
-                            locog.ChangeGearUp();
-
-                            ControlGearUp = false;
+                            locog.ChangeGearUp();                                                        
                         }
 
-
                         if (ControlGearDown)
                         {
 
                             locog.GearBoxController.CurrentNotch = GearBoxController.CurrentNotch;
                             locog.GearBoxController.SetValue((float)locog.GearBoxController.CurrentNotch);
 
-                            locog.ChangeGearDown();
-
-                            ControlGearDown = false;
+                            locog.ChangeGearDown();                            
                         }
+                    }
 
-                        // Read values for the HuD
+                    // Read values for the HuD, will be based upon the last motorcar
+                    if (locog != null)
+                    {
                         ControlGearIndex = locog.DieselEngines[0].GearBox.CurrentGearIndex;
                         ControlGearIndication = locog.DieselEngines[0].GearBox.GearIndication;
                     }
-
                 }
+           
+                
+                // Rest gear flags once all the cars have been processed
+                ControlGearUp = false;
+                ControlGearDown = false;
+
             }
 
         }

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

@@ -1828,42 +1828,47 @@ public override void Update(float elapsedClockSeconds)
             var gearloco = this as MSTSDieselLocomotive;
 
             // Pass Gearbox commands
+
+
+
+
             // Note - at the moment there is only one GearBox Controller created, but a gearbox for each diesel engine is created. 
             // This code keeps all gearboxes in the locomotive aligned with the first engine and gearbox.
-            if (gearloco != null && gearloco.DieselTransmissionType == MSTSDieselLocomotive.DieselTransmissionTypes.Mechanic && GearBoxController.CurrentNotch != previousChangedGearBoxNotch && IsLeadLocomotive())
+            if (gearloco != null && gearloco.DieselTransmissionType == MSTSDieselLocomotive.DieselTransmissionTypes.Mechanic && GearBoxController.CurrentNotch != previousChangedGearBoxNotch)
             {
-                // pass gearbox command key to other gearboxes in the same locomotive, only do the current locomotive
+                // pass gearbox command key to other gearboxes in the same locomotive, only do the current locomotive             
 
-                if (gearloco == this)
+                int ii = 0;
+                foreach (var eng in gearloco.DieselEngines.DEList)
                 {
-
-                    int ii = 0;
-                    foreach (var eng in gearloco.DieselEngines.DEList)
+                    // don't change the first engine as this is the reference for all the others
+                    if (ii != 0)
                     {
-                        // don't change the first engine as this is the reference for all the others
-                        if (ii != 0)
-                        {
-                            gearloco.DieselEngines[ii].GearBox.currentGearIndex = gearloco.DieselEngines[0].GearBox.CurrentGearIndex;
-                        }
-
-                        ii = ii + 1;
+                        gearloco.DieselEngines[ii].GearBox.currentGearIndex = gearloco.DieselEngines[0].GearBox.CurrentGearIndex;
                     }
+                    
+                    ii = ii + 1;
                 }
 
-                // pass gearbox command key to other locomotives in train, don't treat the player locomotive in this fashion.
+            }
+
+            // The lead locomotive passes gearbox commands position to other locomotives in train, don't treat the player locomotive in this fashion.
+
+            if (gearloco != null && gearloco.DieselTransmissionType == MSTSDieselLocomotive.DieselTransmissionTypes.Mechanic && GearBoxController.CurrentNotch != previousChangedGearBoxNotch && IsLeadLocomotive())
+            {
+ 
                 foreach (TrainCar car in Train.Cars)
                 {
-                    var dieselloco = this as MSTSDieselLocomotive;
                     var locog = car as MSTSDieselLocomotive;
 
-                    if (locog != null && dieselloco != null && car != this && !locog.IsLeadLocomotive())
+                    if (locog != null && gearloco != null && car != this && !locog.IsLeadLocomotive())
                     {
 
-                        locog.DieselEngines[0].GearBox.currentGearIndex = dieselloco.DieselEngines[0].GearBox.CurrentGearIndex;
+                        locog.DieselEngines[0].GearBox.currentGearIndex = gearloco.DieselEngines[0].GearBox.CurrentGearIndex;
 
-                        locog.GearBoxController.CurrentNotch = dieselloco.DieselEngines[0].GearBox.CurrentGearIndex + 1;
-                        locog.GearboxGearIndex = dieselloco.DieselEngines[0].GearBox.CurrentGearIndex + 1;
-                        locog.GearBoxController.SetValue((float)dieselloco.GearBoxController.CurrentNotch);
+                        locog.GearBoxController.CurrentNotch = gearloco.DieselEngines[0].GearBox.CurrentGearIndex + 1;
+                        locog.GearboxGearIndex = gearloco.DieselEngines[0].GearBox.CurrentGearIndex + 1;
+                        locog.GearBoxController.SetValue((float)gearloco.GearBoxController.CurrentNotch);
 
                         locog.Simulator.Confirmer.ConfirmWithPerCent(CabControl.GearBox, CabSetting.Increase, locog.GearBoxController.CurrentNotch);
                         locog.AlerterReset(TCSEvent.GearBoxChanged);