Skip to content

Commit 1855c90

Browse files
committed
Automatic merge of T1.5.1-553-g4b9199858 and 15 pull requests
- Pull request #757 at 98dd1a7: Unify RailDriver code implementations - Pull request #831 at 61bbf43: poor mans switch panel on tablet - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #841 at 410a585: https://blueprints.launchpad.net/or/+spec/animating-trainset-windows - Pull request #853 at d05f581: Notify out of focus - Pull request #855 at b39e5d8: Adds new route from TrainSimulations - Pull request #857 at 9afc8c3: Adding Air Flow Meters - Pull request #859 at 0e963aa: Steam adhesion bug#1 - Pull request #860 at 82a584a: Changes in the Car Operations Menu for the lines with brake information - Pull request #862 at 489f261: Fix engine leak problem - Pull request #863 at a34b857: Alternate preset 3D cabviewpoints - Pull request #864 at 18c5481: Fixes for Undesired Emergency Applications - Pull request #865 at 776d6df: Dispatcher window improvements - Pull request #866 at a6cbc52: Fix Articulation For 0-Axle Train Cars - Pull request #868 at 1b42d4c: Bug fix for Exhaust of non-lead diesels is not correct https://bugs.launchpad.net/or/+bug/2033621
17 parents 1335eec + 4b91998 + 98dd1a7 + 61bbf43 + d00beb9 + 410a585 + d05f581 + b39e5d8 + 9afc8c3 + 0e963aa + 82a584a + 489f261 + a34b857 + 18c5481 + 776d6df + a6cbc52 + 1b42d4c commit 1855c90

File tree

1 file changed

+6
-0
lines changed
  • Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies

1 file changed

+6
-0
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/DieselEngine.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -987,6 +987,12 @@ public void Copy(DieselEngine other)
987987
DieselMaxOilPressurePSI = other.DieselMaxOilPressurePSI;
988988
DieselMinOilPressurePSI = other.DieselMinOilPressurePSI;
989989
DieselMaxTemperatureDeg = other.DieselMaxTemperatureDeg;
990+
ExhaustAccelIncrease = other.ExhaustAccelIncrease;
991+
ExhaustDecelReduction = other.ExhaustDecelReduction;
992+
EngineCooling = other.EngineCooling;
993+
DieselTempTimeConstantSec = other.DieselTempTimeConstantSec;
994+
DieselOptimalTemperatureDegC = other.DieselOptimalTemperatureDegC;
995+
DieselIdleTemperatureDegC = other.DieselIdleTemperatureDegC;
990996
}
991997

992998
public void Initialize()

0 commit comments

Comments
 (0)