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

Further enhancements to Control Car

Author: cjakeman

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

@@ -4578,18 +4578,51 @@ public virtual float GetDataOf(CabViewControl cvc)
 
                 case CABViewControlTypes.ORTS_DIESEL_TEMPERATURE:
                     {
-                        var mstsDieselLocomotive = this as MSTSDieselLocomotive;
-                        if (mstsDieselLocomotive.DieselEngines[0] != null)
-                            data = mstsDieselLocomotive.DieselEngines[0].DieselTemperatureDeg;
+
+                        if (EngineType == EngineTypes.Control)
+                        {
+                            FindControlActiveLocomotive();
+
+                            if (ControlActiveLocomotive != null)
+                            {
+                                var activeloco = ControlActiveLocomotive as MSTSDieselLocomotive;
+                                if (activeloco.DieselEngines[0] != null)
+                                    data = activeloco.DieselEngines[0].DieselTemperatureDeg;
+                            }
+
+                        }
+                        else
+                        {
+                            var mstsDieselLocomotive = this as MSTSDieselLocomotive;
+                            if (mstsDieselLocomotive.DieselEngines[0] != null)
+                                data = mstsDieselLocomotive.DieselEngines[0].DieselTemperatureDeg;
+                        }
                         break;
                     }
+
                 case CABViewControlTypes.ORTS_OIL_PRESSURE:
                     {
-                        var mstsDieselLocomotive = this as MSTSDieselLocomotive;
-                        if (mstsDieselLocomotive.DieselEngines[0] != null)
-                            data = ConvertFromPSI(cvc, mstsDieselLocomotive.DieselEngines[0].DieselOilPressurePSI);
+                        if (EngineType == EngineTypes.Control)
+                        {
+                            FindControlActiveLocomotive();
+
+                            if (ControlActiveLocomotive != null)
+                            {
+                                var activeloco = ControlActiveLocomotive as MSTSDieselLocomotive;
+                                if (activeloco.DieselEngines[0] != null)
+                                    data = activeloco.DieselEngines[0].DieselOilPressurePSI;
+                            }
+
+                        }
+                        else
+                        {
+                            var mstsDieselLocomotive = this as MSTSDieselLocomotive;
+                            if (mstsDieselLocomotive.DieselEngines[0] != null)
+                                data = mstsDieselLocomotive.DieselEngines[0].DieselOilPressurePSI;
+                        }
                         break;
                     }
+
                 case CABViewControlTypes.THROTTLE:
                 case CABViewControlTypes.THROTTLE_DISPLAY:
                 case CABViewControlTypes.CPH_DISPLAY:
@@ -4729,10 +4762,31 @@ public virtual float GetDataOf(CabViewControl cvc)
                     }
                 case CABViewControlTypes.WHEELSLIP:
                     {
-                        if (AdvancedAdhesionModel && Train.TrainType != Train.TRAINTYPE.AI_PLAYERHOSTING)
-                            data = LocomotiveAxle.IsWheelSlipWarning ? 1 : 0;
+                        if (EngineType == EngineTypes.Control)
+                        {
+                            FindControlActiveLocomotive();
+
+                            if (ControlActiveLocomotive != null)
+                            {
+                                var activeloco = ControlActiveLocomotive as MSTSDieselLocomotive;
+                                if (activeloco.DieselEngines[0] != null)
+                                {
+                                    if (activeloco.AdvancedAdhesionModel && Train.TrainType != Train.TRAINTYPE.AI_PLAYERHOSTING)
+                                        data = activeloco.LocomotiveAxle.IsWheelSlipWarning ? 1 : 0;
+                                    else
+                                        data = activeloco.WheelSlip ? 1 : 0;
+
+                                }
+                            }
+
+                        }
                         else
-                            data = WheelSlip ? 1 : 0;
+                        {
+                            if (AdvancedAdhesionModel && Train.TrainType != Train.TRAINTYPE.AI_PLAYERHOSTING)
+                                data = LocomotiveAxle.IsWheelSlipWarning ? 1 : 0;
+                            else
+                                data = WheelSlip ? 1 : 0;
+                        }
                         break;
                     }