Skip to content

Commit ee117d3

Browse files
committed
Automatic merge of T1.6-59-g2eb7441b0 and 11 pull requests
- Pull request #1156 at f46d5f2: Fix incorrectly disabled options in train operations window - Pull request #1086 at d8d61eb: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at e813c42: Automatic speed control - Pull request #1104 at 7919243: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1124 at e241a0d: Built-in PBL2 brake controller - Pull request #1157 at 39cd994: Dynamic brake authorization by TCS - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1128 at 1d7643d: Particle Emitter Overhaul
13 parents 575996f + 2eb7441 + f46d5f2 + d8d61eb + e813c42 + 7919243 + 270f22f + ba3c47f + 91d2d26 + e241a0d + 39cd994 + 5845a1a + 1d7643d commit ee117d3

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,6 +1189,7 @@ public ToggleBatterySwitch(int x, int y, int size, Viewer viewer, int carPositio
11891189
if (wagon.PowerSupply.BatterySwitch.Mode == BatterySwitch.ModeType.AlwaysOn)
11901190
{
11911191
Texture = BattAlwaysOn32;
1192+
TrainCarViewer.BatterySwitchOn = wagon.PowerSupply.BatterySwitch.On;
11921193
}
11931194
else
11941195
{

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,6 +1091,7 @@ public buttonFrontAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,
10911091
Viewer = viewer;
10921092
TrainCarViewer = Viewer.TrainCarOperationsViewerWindow;
10931093
var CurrentCar = Viewer.PlayerTrain.Cars[carPosition];
1094+
var First = car == viewer.PlayerTrain.Cars.First();
10941095

10951096
if (CurrentCar.BrakeSystem is VacuumSinglePipe)
10961097
{
@@ -1109,7 +1110,7 @@ public buttonFrontAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,
11091110
var trainCarOperations = Viewer.TrainCarOperationsWindow;
11101111
if (!trainCarOperations.WarningCarPosition[carPosition])
11111112
{
1112-
trainCarOperations.updateWarningCarPosition(carPosition, Texture, FrontAngleCockClosed);
1113+
trainCarOperations.updateWarningCarPosition(carPosition, Texture, First ? FrontAngleCockOpened : FrontAngleCockClosed);
11131114
trainCarOperations.updateWarningCarPosition(carPosition, Texture, FrontAngleCockPartial);
11141115
}
11151116
}
@@ -1122,6 +1123,7 @@ public buttonRearAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,
11221123
{
11231124
Viewer = viewer;
11241125
var CurrentCar = Viewer.PlayerTrain.Cars[carPosition];
1126+
var Last = car == viewer.PlayerTrain.Cars.Last();
11251127

11261128
if (CurrentCar.BrakeSystem is VacuumSinglePipe)
11271129
{
@@ -1140,7 +1142,7 @@ public buttonRearAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,
11401142
var trainCarOperations = Viewer.TrainCarOperationsWindow;
11411143
if (!trainCarOperations.WarningCarPosition[carPosition])
11421144
{
1143-
trainCarOperations.updateWarningCarPosition(carPosition, Texture, RearAngleCockClosed);
1145+
trainCarOperations.updateWarningCarPosition(carPosition, Texture, Last ? RearAngleCockOpened: RearAngleCockClosed);
11441146
trainCarOperations.updateWarningCarPosition(carPosition, Texture, RearAngleCockPartial);
11451147
}
11461148
}

0 commit comments

Comments
 (0)