Skip to content

Commit 0454f4e

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 #949 at d29622b: Oil Burning Locomotive - 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
20 parents 1fd7ff5 + 6fd8417 + dfc715e + d00beb9 + f92de76 + 8f695a4 + 2728d6d + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + 3e390b8 + 359cfee + 0d3e70b + 66f836c + d29622b + b2af1f5 + a519452 + 84c2f4b + 6adc5a3 commit 0454f4e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Source/RunActivity/Viewer3D/Popups/TrainListWindow.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ protected override ControlLayout Layout(ControlLayout layout)
9191
line.Add(viewed = new TrainLabel(Owner.TextFontDefault.Height, line.RemainingHeight, Owner.Viewer, thisTrain, "*", LabelAlignment.Right));
9292
viewed.Color = Color.Red;
9393
}
94-
if (Owner.Viewer.Simulator.IsAutopilotMode)
94+
if (Owner.Viewer.Simulator.IsAutopilotMode && !Owner.Viewer.Simulator.TimetableMode)
9595
{
9696
number.Color = thisTrain.IsPlayable ? Color.LightGreen : Color.White;
9797
name.Color = thisTrain.IsPlayable ? Color.LightGreen : Color.White;
@@ -110,7 +110,7 @@ protected override ControlLayout Layout(ControlLayout layout)
110110
}
111111

112112
// Now list static trains with loco and cab
113-
if (Owner.Viewer.Simulator.IsAutopilotMode)
113+
if (Owner.Viewer.Simulator.IsAutopilotMode && !Owner.Viewer.Simulator.TimetableMode)
114114
{
115115
foreach (var thisTrain in Owner.Viewer.Simulator.Trains)
116116
{
@@ -181,9 +181,9 @@ void TrainListLabel_Click(Control arg1, Point arg2)
181181
}
182182
if (PickedTrainFromList != null && (PickedTrainFromList == Viewer.SelectedTrain || (PickedTrainFromList.TrainType == Train.TRAINTYPE.AI_INCORPORATED &&
183183
(PickedTrainFromList as AITrain).IncorporatingTrain.IsPathless && (PickedTrainFromList as AITrain).IncorporatingTrain == Viewer.SelectedTrain)) && !PickedTrainFromList.IsActualPlayerTrain &&
184-
Viewer.Simulator.IsAutopilotMode && PickedTrainFromList.IsPlayable)
184+
Viewer.Simulator.IsAutopilotMode && PickedTrainFromList.IsPlayable && !Viewer.Simulator.TimetableMode)
185185
{
186-
if (UserInput.IsDown(UserCommand.GameSuspendOldPlayer))
186+
if (UserInput.IsDown(UserCommand.GameSuspendOldPlayer) && !Viewer.Simulator.TimetableMode)
187187
Viewer.Simulator.TrainSwitcher.SuspendOldPlayer = true;
188188
//Ask for change of driven train
189189
Viewer.Simulator.TrainSwitcher.SelectedAsPlayer = PickedTrainFromList;

0 commit comments

Comments
 (0)