Skip to content

Commit 4f7be48

Browse files
committed
Automatic merge of T1.5.1-1004-g6fd841761e and 21 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 a3bc9e7: Autopilot for timetable mode - Pull request #946 at 91a03af: Advanced track sounds - Pull request #949 at 0037ba2: Oil Burning Locomotive - Pull request #952 at 8347095: Investigation - Pulsing graphics - 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 406cba6: Map settings saved - Pull request #959 at 2452cb0: Fix TrackViewer crash on big zoom value - Pull request #960 at c8e2a28: Fix draw state name in scripts - Pull request #962 at 46d0472: Fix pantographs on unpowered cars
23 parents de3bfdb + 6fd8417 + dfc715e + d00beb9 + f92de76 + 8f695a4 + 2728d6d + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + 3e390b8 + 359cfee + a3bc9e7 + 91a03af + 0037ba2 + 8347095 + a519452 + 84c2f4b + 406cba6 + 2452cb0 + c8e2a28 + 46d0472 commit 4f7be48

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

Source/Orts.Simulation/Simulation/Simulator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1627,7 +1627,7 @@ private void RestoreTrains(BinaryReader inf)
16271627
// find player train
16281628
foreach (Train thisTrain in Trains)
16291629
{
1630-
if (thisTrain.TrainType == Train.TRAINTYPE.PLAYER || thisTrain is TTTrain && thisTrain == Trains[0]
1630+
if (thisTrain.TrainType == Train.TRAINTYPE.PLAYER || (thisTrain is TTTrain && thisTrain == Trains[0])
16311631
|| thisTrain.TrainType == Train.TRAINTYPE.AI_PLAYERDRIVEN || thisTrain.TrainType == Train.TRAINTYPE.AI_PLAYERHOSTING)
16321632
{
16331633
TrainDictionary.Add(thisTrain.Number, thisTrain);

Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2389,7 +2389,7 @@ public bool StartFromAITrain(TTTrain otherTrain, int presentTime, TrackCircuitSe
23892389
LeadLocomotiveIndex = otherTrain.LeadLocomotiveIndex;
23902390

23912391
// Copy other train speed if not restricted for either train
2392-
if (!otherTrain.SpeedSettings.restrictedSet && !SpeedSettings.restrictedSet || TrainMaxSpeedMpS == 0)
2392+
if ((!otherTrain.SpeedSettings.restrictedSet && !SpeedSettings.restrictedSet) || TrainMaxSpeedMpS == 0)
23932393
{
23942394
TrainMaxSpeedMpS = otherTrain.TrainMaxSpeedMpS;
23952395
}
@@ -4061,16 +4061,6 @@ public override void UpdateStationState(float elapsedClockSeconds, int presentTi
40614061
ResetActions(true);
40624062
}
40634063

4064-
//================================================================================================//
4065-
/// <summary>
4066-
/// If autopiloted, generate strings for NextStationWindow
4067-
/// Override for AITrain class
4068-
/// <\summary>
4069-
public void PopulateNextStationWindow()
4070-
{
4071-
}
4072-
4073-
40744064
//================================================================================================//
40754065
/// <summary>
40764066
/// Update for train in Braking state
@@ -13521,7 +13511,6 @@ public bool PerformDetach(TTTrain train, bool allowPlayerSelect)
1352113511
Trace.TraceInformation("Train {0} : detach to train {1} : cannot find new train \n", train.Name, DetachFormedTrainName);
1352213512
}
1352313513

13524-
// newTrain.Autopilot = train.Autopilot;
1352513514
train.DetachUnits = iunits;
1352613515
train.DetachPosition = frontpos;
1352713516

0 commit comments

Comments
 (0)