Skip to content

Commit 07d4285

Browse files
committed
Automatic merge of T1.6-rc4-34-g041d7ab18 and 16 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at aa72c13: Automatic speed control - Pull request #1104 at 0017b1a: Handle simple adhesion within the axle module - Pull request #1110 at 387388e: Fix Activity Runner persists after loading exception - 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 abe7c8a: Fix F9 points to an incorrect car ID. - Pull request #1132 at 934d29e: Fixes For Correct Questionable Braking Parameters - Pull request #1133 at 8dc00d5: Minor Fix for Brake Pipe Charging - Pull request #1136 at 6f1b82f: Fix Curve Resistance Calculation - Pull request #1137 at c2c9e2a: Apply brakes at startup on minimal reduction - 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
18 parents 781eb09 + 041d7ab + e10390b + aa72c13 + 0017b1a + 387388e + 270f22f + ba3c47f + 91d2d26 + abe7c8a + 934d29e + 8dc00d5 + 6f1b82f + c2c9e2a + 5845a1a + 689494b + fab5457 + 58de4c3 commit 07d4285

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

Source/RunActivity/Viewer3D/Cameras.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,6 +1083,21 @@ protected override void OnActivate(bool sameCamera)
10831083
isVisibleTrainCarViewerOrWebpage = (Viewer.TrainCarOperationsWindow.Visible && !Viewer.TrainCarOperationsViewerWindow.Visible) || Viewer.TrainCarOperationsViewerWindow.Visible || (Viewer.TrainCarOperationsWebpage?.Connections > 0 && Viewer.TrainCarOperationsWebpage.TrainCarSelected);
10841084
}
10851085

1086+
if (isVisibleTrainCarViewerOrWebpage)
1087+
{
1088+
// Update the camera view
1089+
oldCarPosition = oldCarPosition == 0 && carPosition == 0 ? -1 : oldCarPosition;
1090+
}
1091+
1092+
if (attachedCar != null && !isVisibleTrainCarViewerOrWebpage && !Front)
1093+
{// Reset behaviour of camera 3, after closing F9-window and F9-web.
1094+
var attachedCarPosition = attachedCar.Train.Cars.TakeWhile(x => x.CarID != attachedCar.CarID).Count();
1095+
if (attachedCarPosition == carPosition)
1096+
{
1097+
attachedCar = trainCars.Last();
1098+
}
1099+
}
1100+
10861101
if (attachedCar == null || attachedCar.Train != Viewer.SelectedTrain || carPosition != oldCarPosition)
10871102
{
10881103
if (Front)

0 commit comments

Comments
 (0)