marc/openbve-fcmb-train-plugin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: marc:7f3388b24a1a0953cab8f2829d219b40e87b729b
Branches Tags
marc:main
...
compare: marc:a836a0e43874ef30c56832bd411526d9ec4f518f
Branches Tags
marc:main

2 commits
7f3388b24a ... a836a0e438

Author SHA1 Message Date
Marc Riera
a836a0e438 Panel variable indices 2024-12-26 00:36:56 +01:00
Marc Riera
ebb673c4d5 Config: Resolve ATC conflict 2024-12-26 00:36:28 +01:00
3 changed files with 16 additions and 11 deletions
Show stats Expand all files Collapse all files

13
src/Devices/AtcDimetronic.cs
View file

@ -346,13 +346,12 @@ namespace OpenbveFcmbTrainPlugin
}
// Panel indicators
train.Panel[25] = DeviceState == DeviceStates.Override ? 1 : 0;
train.Panel[26] = DeviceState == DeviceStates.YARD ? 1 : 0;
train.Panel[27] = DeviceState == DeviceStates.ATP ? 1 : 0;
train.Panel[28] = DeviceState == DeviceStates.ATO ? 1 : 0;
train.Panel[34] = (int)CurrentSpeedCode.CurrentLimit.KilometersPerHour * 1000;
train.Panel[33] = 1;
train.Panel[35] = (int)CurrentSpeedCode.TargetLimit.KilometersPerHour * 1000;
train.Panel[11] = TrackState > TrackStates.Unprotected && train.PhysicalHandles.Reverser == 1 ? 1 : 0;
train.Panel[12] = AtcControlState == AtcControlStates.NoPower || AtcControlState == AtcControlStates.NoPowerAlarm ? 1 : 0;
train.Panel[13] = (int)DeviceState;
train.Panel[14] = (int)CurrentSpeedCode.CurrentLimit.KilometersPerHour * 1000;
train.Panel[15] = (int)CurrentSpeedCode.TargetLimit.KilometersPerHour * 1000;
train.Panel[16] = (int)DeviceState > 1 ? 1 : 0;
// Play alarm sound
if (AtcControlState == AtcControlStates.NoPowerAlarm)

4
src/Devices/DoorSelection.cs
View file

@ -39,8 +39,8 @@ namespace OpenbveFcmbTrainPlugin
}
// Update panel variables for door selection state
train.Panel[50] = (RequestedDoorInterlock == DoorInterlockStates.Left || RequestedDoorInterlock == DoorInterlockStates.Unlocked) || (((train.DoorState & DoorStates.Left) != 0) && !LeftDoorsClosing) ? 1 : 0;
train.Panel[51] = (RequestedDoorInterlock == DoorInterlockStates.Right || RequestedDoorInterlock == DoorInterlockStates.Unlocked) || (((train.DoorState & DoorStates.Right) != 0) && !RightDoorsClosing) ? 1 : 0;
train.Panel[1] = (RequestedDoorInterlock == DoorInterlockStates.Left || RequestedDoorInterlock == DoorInterlockStates.Unlocked) || (((train.DoorState & DoorStates.Left) != 0) && !LeftDoorsClosing) ? 1 : 0;
train.Panel[2] = (RequestedDoorInterlock == DoorInterlockStates.Right || RequestedDoorInterlock == DoorInterlockStates.Unlocked) || (((train.DoorState & DoorStates.Right) != 0) && !RightDoorsClosing) ? 1 : 0;
}
/// <summary>Is called when the state of a key changes.</summary>

10
src/Managers/ConfigManager.cs
View file

@ -175,7 +175,10 @@ namespace OpenbveFcmbTrainPlugin
switch (Key)
{
case "enabled":
PluginSettings.AtcBombardierDeviceEnabled = string.Compare(Value, "false", StringComparison.OrdinalIgnoreCase) != 0;
if (!PluginSettings.AtcDimetronicDeviceEnabled)
{
PluginSettings.AtcBombardierDeviceEnabled = string.Compare(Value, "false", StringComparison.OrdinalIgnoreCase) != 0;
}
break;
case "initializationtime":
{
@ -215,7 +218,10 @@ namespace OpenbveFcmbTrainPlugin
switch (Key)
{
case "enabled":
PluginSettings.AtcDimetronicDeviceEnabled = string.Compare(Value, "false", StringComparison.OrdinalIgnoreCase) != 0;
if (!PluginSettings.AtcBombardierDeviceEnabled)
{
PluginSettings.AtcDimetronicDeviceEnabled = string.Compare(Value, "false", StringComparison.OrdinalIgnoreCase) != 0;
}
break;
case "yardspeedlimit":
{