Skip to content

Commit 7244d3a

Browse files
committed
Correct Control car defaults
1 parent 2c8deab commit 7244d3a

File tree

1 file changed

+38
-2
lines changed

1 file changed

+38
-2
lines changed

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

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,8 @@ public float OdometerM
327327
// ENG file data
328328
public string CabSoundFileName;
329329
public string CVFFileName;
330-
public float MaxMainResPressurePSI = 130;
331-
public float MainResVolumeM3 = 0.3f;
330+
public float MaxMainResPressurePSI;
331+
public float MainResVolumeM3;
332332
public float TrainBrakePipeLeakPSIorInHgpS = 0.0f; // Air leakage from train brake pipe - should normally be no more then 5psi/min - default off
333333
public float CompressorRestartPressurePSI = 110;
334334
public float CompressorChargingRateM3pS = 0.075f;
@@ -1305,6 +1305,42 @@ public override void Initialize()
13051305
const float Aconst = 2;
13061306
WaterScoopMinSpeedMpS = Me.FromFt((float)Math.Sqrt(Aconst * GravitationalAccelerationFtpSpS * Me.ToFt(WaterScoopFillElevationM)));
13071307

1308+
1309+
if (MaxMainResPressurePSI == 0)
1310+
{
1311+
if (EngineType == EngineTypes.Control)
1312+
{
1313+
FindControlActiveLocomotive();
1314+
1315+
if( ControlActiveLocomotive != null)
1316+
{
1317+
MaxMainResPressurePSI = ControlActiveLocomotive.MaxMainResPressurePSI; // Set maximum reservoir pressure from active locomotive
1318+
}
1319+
else
1320+
{
1321+
MaxMainResPressurePSI = 130;
1322+
}
1323+
}
1324+
else
1325+
{
1326+
MaxMainResPressurePSI = 130;
1327+
}
1328+
1329+
}
1330+
1331+
if (MainResVolumeM3 == 0)
1332+
{
1333+
if (EngineType == EngineTypes.Control)
1334+
{
1335+
MainResVolumeM3 = 0.01f;
1336+
}
1337+
else
1338+
{
1339+
MainResVolumeM3 = 0.3f;
1340+
}
1341+
1342+
}
1343+
13081344
// Initialise Brake Pipe Charging Rate
13091345
if (BrakePipeChargingRatePSIorInHgpS == 0) // Check to see if BrakePipeChargingRate has been set in the ENG file.
13101346
{

0 commit comments

Comments
 (0)