Skip to content

Commit 788c1ae

Browse files
committed
Automatic merge of T1.6-rc6-37-g6dd094783 and 12 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1104 at 86d38a2: 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 #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1139 at 03c6f8f: Fix for bug https://bugs.launchpad.net/or/+bug/2117357. - Pull request #1142 at a24747c: Fix light position calculation for deeper hierarchy levels - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller - Pull request #1128 at 58de4c3: Particle Emitter Overhaul
14 parents cfa5bca + 6dd0947 + e10390b + 86d38a2 + 270f22f + ba3c47f + 91d2d26 + 8ae6bb7 + 03c6f8f + a24747c + 5845a1a + 689494b + fab5457 + 58de4c3 commit 788c1ae

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

Source/RunActivity/Viewer3D/WebServices/TrainCarOperationsWebpage.cs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
using Orts.Simulation.RollingStocks.SubSystems.Brakes.MSTS;
3232
using ORTS.Scripting.Api;
3333
using System.IO;
34-
using Orts.Simulation.Physics;
35-
using Orts.Simulation.RollingStocks.SubSystems.Brakes;
3634

3735
namespace Orts.Viewer3D.WebServices
3836
{
@@ -711,10 +709,7 @@ public void buttonCouplerFrontClick(int carPosition)
711709
TrainCarViewer.NewCarPosition = carPosition - 1;
712710
if (Viewer.CarOperationsWindow.CarPosition > carPosition - 1)
713711
Viewer.CarOperationsWindow.Visible = false;
714-
if (Viewer.TrainCarOperationsWindow.SelectedCarPosition >= Viewer.PlayerTrain.Cars.Count())
715-
{
716-
Viewer.TrainCarOperationsWindow.SelectedCarPosition = Viewer.PlayerTrain.Cars.Count - 1;
717-
}
712+
Viewer.TrainCarOperationsWindow.SelectedCarPosition = 0;
718713
}
719714
}
720715

@@ -814,10 +809,7 @@ public void buttonCouplerRearClick(int carPosition)
814809
TrainCarViewer.CouplerChanged = TrainCar.CouplerClicked = true;
815810
if (Viewer.CarOperationsWindow.CarPosition > carPosition)
816811
Viewer.CarOperationsWindow.Visible = false;
817-
if (Viewer.TrainCarOperationsWindow.SelectedCarPosition >= Viewer.PlayerTrain.Cars.Count())
818-
{
819-
Viewer.TrainCarOperationsWindow.SelectedCarPosition = Viewer.PlayerTrain.Cars.Count - 1;
820-
}
812+
Viewer.TrainCarOperationsWindow.SelectedCarPosition = 0;
821813
}
822814
}
823815

0 commit comments

Comments
 (0)