Skip to content

Commit 0524552

Browse files
committed
Automatic merge of T1.5.1-1002-g8f19fccc46 and 20 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 58b659d: Blueprint/train car operations UI window - Pull request #885 at 56c17fb: 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 abe2e52: Autopilot for timetable mode - Pull request #946 at 66f836c: Advanced track sounds - Pull request #949 at aac0de8: Oil Burning Locomotive - Pull request #951 at 486081b: fix: Fix watchdog process state name - 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 25193a8: Map settings saved - Pull request #957 at 275dd6c: Switch panel (web based) enhancements
22 parents e775599 + 8f19fcc + dfc715e + d00beb9 + f92de76 + 58b659d + 56c17fb + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + 3e390b8 + 359cfee + abe2e52 + 66f836c + aac0de8 + 486081b + b2af1f5 + a519452 + 84c2f4b + 25193a8 + 275dd6c commit 0524552

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"profiles": {
3+
"RunActivity": {
4+
"commandName": "Project",
5+
"commandLineArgs": "-start -exploreactivity \"D:\\OpenRails\\Demo Model 1\\Demo Model 1\\ROUTES\\SCE\\PATHS\\MT_MT_0930 Edinburgh-Glasgow Queen Street(player) - original.PAT\" \"D:\\OpenRails\\Demo Model 1\\Demo Model 1\\TRAINS\\CONSISTS\\MT_MT_Class 27 102 & 6 mk2 PP.CON\" 12:00 1 0"
6+
}
7+
}
8+
}

Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,18 @@ private static void getStatusControlEmergencyPushButton(ref SwitchOnPanelStatus
178178
}
179179
}
180180

181+
private static void getStatusControlAlerterPushButton(ref SwitchOnPanelStatus switchOnPanelStatus)
182+
{
183+
MSTSLocomotive locomotive = Viewer.PlayerLocomotive as MSTSLocomotive;
184+
185+
if (locomotive.AlerterSnd)
186+
{
187+
switchOnPanelStatus.Status = "Alerter";
188+
switchOnPanelStatus.Color = "red";
189+
switchOnPanelStatus.Blinking = true;
190+
}
191+
}
192+
181193
private static void getStatusGameControlMode(ref SwitchOnPanelStatus switchOnPanelStatus)
182194
{
183195
switch (Viewer.PlayerTrain.ControlMode)
@@ -505,6 +517,9 @@ public static void getStatus(UserCommand userCommand, ref SwitchOnPanelStatus sw
505517
case UserCommand.ControlEmergencyPushButton:
506518
getStatusControlEmergencyPushButton(ref switchOnPanelStatus);
507519
break;
520+
case UserCommand.ControlAlerter:
521+
getStatusControlAlerterPushButton(ref switchOnPanelStatus);
522+
break;
508523
case UserCommand.GameSwitchManualMode:
509524
getStatusGameControlMode(ref switchOnPanelStatus);
510525
break;

0 commit comments

Comments
 (0)