Skip to content

Commit 12780b2

Browse files
committed
Automatic merge of T1.5.1-1288-g58b2418aa6 and 13 pull requests
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #952 at 8347095: Investigation - Pulsing graphics - Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes - Pull request #972 at e90a2aa: On Map window color changed switch or signal is not changed - Pull request #981 at 10d297f: Multiple type trainset lightglows - Pull request #982 at efcf19c: WEB based Switch Panel enhancement: Alerter - Pull request #984 at 0f8122e: Player train switching for timetable mode - Pull request #986 at 5d7e692: Fix: The TrainCarOperations window does not resize correctly. - Pull request #987 at 232e8fb: fix: Temporary workaround for building with NET 5+ - Pull request #900 at c27f32d: DMI updates - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #954 at f9e62b1: Multiple Track Profiles & Superelevation Rewrite
15 parents 408bb86 + 58b2418 + d00beb9 + 1f5ba4c + 8347095 + a519452 + e90a2aa + 10d297f + efcf19c + 0f8122e + 5d7e692 + 232e8fb + c27f32d + f92de76 + f9e62b1 commit 12780b2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Source/Orts.Simulation/Simulation/Simulator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2126,15 +2126,15 @@ private void CompleteSwitchPlayerTrain()
21262126
if (PlayerLocomotive.Train.TrainType != Train.TRAINTYPE.STATIC)
21272127
{
21282128
if (!TimetableMode)
2129-
AI.AITrains.Remove(PlayerLocomotive.Train as AITrain);
2129+
AI.AITrains.Remove(PlayerLocomotive.Train as AITrain);
21302130
if ((PlayerLocomotive.Train as AITrain).MovementState == AITrain.AI_MOVEMENT_STATE.SUSPENDED)
21312131
{
21322132
PlayerLocomotive.Train.Reinitialize();
21332133
(PlayerLocomotive.Train as AITrain).MovementState = Math.Abs(PlayerLocomotive.Train.SpeedMpS) <= MaxStoppedMpS ?
21342134
AITrain.AI_MOVEMENT_STATE.INIT : AITrain.AI_MOVEMENT_STATE.BRAKING;
21352135
}
21362136
if (!TimetableMode)
2137-
(PlayerLocomotive.Train as AITrain).SwitchToPlayerControl();
2137+
(PlayerLocomotive.Train as AITrain).SwitchToPlayerControl();
21382138
else
21392139
PlayerLocomotive.Train.DisplayMessage = "";
21402140
}

0 commit comments

Comments
 (0)