Skip to content

Commit cb52477

Browse files
committed
Automatic merge of T1.6-106-gdcc176472 and 14 pull requests
- Pull request #1156 at f46d5f2: Fix incorrectly disabled options in train operations window - Pull request #1091 at 492795a: Automatic speed control - 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 #1159 at 48c9a63: Skip OR warnings about TSRE-specific token Ruler - Pull request #1161 at 6cfe4e2: Fix string trim in .ini files - Pull request #1162 at 2516cce: specifies precedence of DDS over ACE - Pull request #1163 at 2f9e292: Fix: Crash when using Camera 8 and F9. - Pull request #1164 at 1ad9889: Fix: F9 crashes with a front coupled single steam locomotive by Csantucci. - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1128 at 086d502: Particle Emitter Overhaul - Pull request #1160 at 9dc6b3b: Route Based TTrack Sounds
16 parents 88e16bf + dcc1764 + f46d5f2 + 492795a + ba3c47f + 91d2d26 + e241a0d + 39cd994 + 48c9a63 + 6cfe4e2 + 2516cce + 2f9e292 + 1ad9889 + 5845a1a + 086d502 + 9dc6b3b commit cb52477

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,8 +602,12 @@ public buttonCouplerFront(int x, int y, int size, Viewer viewer, TrainCar car, i
602602
bool first = car == Viewer.PlayerTrain.Cars.First();
603603
var CurrentCar = Viewer.PlayerTrain.Cars[carPosition];
604604

605-
var isSteamAndHasTender = (CurrentCar is MSTSSteamLocomotive) &&
606-
(carPosition + (CurrentCar.Flipped ? -1 : 1) < Viewer.PlayerTrain.Cars.Count) && (Viewer.PlayerTrain.Cars[carPosition + (CurrentCar.Flipped ? -1 : 1)].WagonType == MSTSWagon.WagonTypes.Tender);
605+
var isSteamAndHasTender = false;
606+
if (CurrentCar is MSTSSteamLocomotive)
607+
{
608+
var validTenderPosition = CurrentCar.Flipped ? carPosition - 1 > -1 : carPosition + 1 < Viewer.PlayerTrain.Cars.Count;
609+
isSteamAndHasTender = validTenderPosition && (Viewer.PlayerTrain.Cars[carPosition + (CurrentCar.Flipped ? -1 : 1)].WagonType == MSTSWagon.WagonTypes.Tender);
610+
}
607611
var isTender = CurrentCar.WagonType == MSTSWagon.WagonTypes.Tender;
608612
if (isSteamAndHasTender || isTender)
609613
{

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -908,8 +908,12 @@ public buttonCouplerFront(int x, int y, int size, Viewer viewer, TrainCar car, i
908908
First = car == Viewer.PlayerTrain.Cars.First();
909909
var CurrentCar = Viewer.PlayerTrain.Cars[carPosition]; ;
910910

911-
var isSteamAndHasTender = (CurrentCar is MSTSSteamLocomotive) &&
912-
(carPosition + (CurrentCar.Flipped ? -1 : 1) < Viewer.PlayerTrain.Cars.Count) && (Viewer.PlayerTrain.Cars[carPosition + (CurrentCar.Flipped ? -1 : 1)].WagonType == MSTSWagon.WagonTypes.Tender);
911+
var isSteamAndHasTender = false;
912+
if (CurrentCar is MSTSSteamLocomotive)
913+
{
914+
var validTenderPosition = CurrentCar.Flipped ? carPosition - 1 > -1 : carPosition + 1 < Viewer.PlayerTrain.Cars.Count;
915+
isSteamAndHasTender = validTenderPosition && (Viewer.PlayerTrain.Cars[carPosition + (CurrentCar.Flipped ? -1 : 1)].WagonType == MSTSWagon.WagonTypes.Tender);
916+
}
913917
var isTender = CurrentCar.WagonType == MSTSWagon.WagonTypes.Tender;
914918

915919
if (isSteamAndHasTender || isTender)

0 commit comments

Comments
 (0)