Skip to content

Commit ee40f03

Browse files
committed
Automatic merge of T1.5.1-1004-g6fd841761e and 18 pull requests
- Pull request #799 at dfc715e: Consolidated wind simulation - 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 8f695a4: Blueprint/train car operations UI window - Pull request #885 at 2728d6d: feat: Add notifications to Menu - Pull request #891 at 9a1d6b2: Auto save - 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 #900 at c27f32d: DMI updates - Pull request #903 at 3e390b8: Downloading route content (Github, zip) - Pull request #912 at 359cfee: New Triple Valve Features Vol. 2 - Pull request #922 at 0d3e70b: Autopilot for timetable mode - Pull request #946 at 66f836c: Advanced track sounds - Pull request #952 at b2af1f5: Investigation - Pulsing graphics part 1 - Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes - Pull request #954 at 84c2f4b: Add Support for Multiple Track Profiles - Pull request #956 at 6adc5a3: Map settings saved - Pull request #960 at c8e2a28: Fix draw state name in scripts
20 parents 6c5b11f + 6fd8417 + dfc715e + d00beb9 + f92de76 + 8f695a4 + 2728d6d + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + 3e390b8 + 359cfee + 0d3e70b + 66f836c + b2af1f5 + a519452 + 84c2f4b + 6adc5a3 + c8e2a28 commit ee40f03

File tree

2 files changed

+104
-658
lines changed

2 files changed

+104
-658
lines changed

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -239,16 +239,6 @@ public float CurrentLocomotiveSteamHeatBoilerWaterCapacityL
239239
//float DebugSpeed = 5.0f; // Initialise at 5 mph
240240
//float DebugTimer = 0.0f;
241241

242-
public enum SteamLocomotiveFuelTypes
243-
{
244-
Unknown,
245-
Oil,
246-
Wood, // not used at the moment
247-
Coal, // defaults to coal
248-
}
249-
250-
public SteamLocomotiveFuelTypes SteamLocomotiveFuelType;
251-
252242
// Adhesion parameters
253243
public enum SlipControlType
254244
{

0 commit comments

Comments
 (0)