Skip to content

Commit fa9fd10

Browse files
committed
Automatic merge of T1.5.1-797-gabb8eb9a4 and 13 pull requests
- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at a055bca: Blueprint/train car operations UI window - Pull request #885 at 8f94333: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #897 at 0a9d939: feat: Improved system information collection - Pull request #899 at a7d476e: Duplex steam engines - Booster Engine addition - Pull request #907 at 9b0b04f: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel - Pull request #908 at 4b4afe3: feat: supports switching adhesion precisions - Pull request #909 at c3a572a: Correct Control Car crash bug
15 parents 19e4bd6 + abb8eb9 + 3539862 + d00beb9 + f92de76 + a055bca + 8f94333 + 6c0785b + 1f5ba4c + 5866028 + 0a9d939 + a7d476e + 9b0b04f + 4b4afe3 + c3a572a commit fa9fd10

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2564,7 +2564,16 @@ private void UpdateFX(float elapsedClockSeconds)
25642564
if (CylinderAdvancedSteamEffects) // For advanced steam effects process each cylinder individually -
25652565
// - all ENG files will need to be changed.
25662566
{
2567-
var TotalNumberCyindersEng1 = SteamEngines[0].NumberCylinders + SteamEngines[0].LPNumberCylinders;
2567+
var TotalNumberCyindersEng1 = 0;
2568+
2569+
if (SteamEngineType == SteamEngineTypes.Compound)
2570+
{
2571+
TotalNumberCyindersEng1 = SteamEngines[0].NumberCylinders + SteamEngines[0].LPNumberCylinders;
2572+
}
2573+
else
2574+
{
2575+
TotalNumberCyindersEng1 = SteamEngines[0].NumberCylinders;
2576+
}
25682577

25692578
// Engine #1
25702579
// Find
@@ -5545,6 +5554,9 @@ private void UpdateCylinders(float elapsedClockSeconds, float throttle, float cu
55455554
// Geared locomotives will have to take into account gearing ratio.
55465555
RawCalculatedCylinderSteamUsageLBpS = SteamEngines[numberofengine].NumberCylinders * DrvWheelRevRpS * MotiveForceGearRatio * CylStrokesPerCycle * RawCylinderSteamWeightLbs;
55475556
CalculatedCylinderSteamUsageLBpS = RawCalculatedCylinderSteamUsageLBpS * SuperheaterSteamUsageFactor;
5557+
5558+
5559+
// Trace.TraceInformation("Steam Consumption - Eng# {0} Calc {1} Raw {2} Factor {3}", numberofengine, pS.TopH(CalculatedCylinderSteamUsageLBpS), pS.TopH(RawCalculatedCylinderSteamUsageLBpS), SuperheaterSteamUsageFactor);
55485560
}
55495561

55505562
#endregion

0 commit comments

Comments
 (0)