Skip to content

Commit a166792

Browse files
committed
Automatic merge of T1.6-143-g2dd8a4679 and 12 pull requests
- Pull request #1082 at 8538170: Allow variable water level in glass gauge - Pull request #1156 at f46d5f2: Fix incorrectly disabled options in train operations window - Pull request #1091 at 492795a: Automatic speed control - Pull request #1122 at 73c47b4: Wagon Size and Centering Controls - Pull request #1124 at e241a0d: Built-in PBL2 brake controller - Pull request #1128 at d116396: Particle Emitter Overhaul - Pull request #1157 at 39cd994: Dynamic brake authorization by TCS - Pull request #1163 at 2f9e292: Fix: Crash when using Camera 8 and F9. - Pull request #1166 at 51e7f7a: Simplify loading of internal and game textures - Pull request #1167 at 115325f: Fix: RunActivity slow to terminate because of long sleep in Host Process - Pull request #1168 at 6e2942f: Fix exception when exiting with MapForm or SoundDebugForm open. - Pull request #1169 at 8fe03b1: Better Handling of Wagons with Invalid Bogie Configuration
14 parents bec27a1 + 2dd8a46 + 8538170 + f46d5f2 + 492795a + 73c47b4 + e241a0d + d116396 + 39cd994 + 2f9e292 + 51e7f7a + 115325f + 6e2942f + 8fe03b1 commit a166792

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -438,8 +438,8 @@ void AddSpace(bool full)
438438
}
439439
if (isElectricDieselLocomotive)
440440
{
441-
line.Add(new buttonToggleMU(0, 0, textHeight, Owner.Viewer, CarPosition));
442-
AddSpace(false);
441+
line.Add(new buttonToggleMU(0, 0, textHeight, Owner.Viewer, CarPosition));
442+
AddSpace(false);
443443

444444
line.Add(new buttonTogglePower(0, 0, textHeight, Owner.Viewer, CarPosition));
445445
AddSpace(false);
@@ -908,8 +908,8 @@ public buttonFrontAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,
908908
: carAngleCockAOpen ? FrontAngleCockOpened
909909
: FrontAngleCockClosed;
910910

911-
Click += new Action<Control, Point>(buttonFrontAngleCock_Click);
912-
}
911+
Click += new Action<Control, Point>(buttonFrontAngleCock_Click);
912+
}
913913
Source = new Rectangle(0, 0, size, size);
914914
}
915915
void buttonFrontAngleCock_Click(Control arg1, Point arg2)
@@ -954,8 +954,8 @@ public buttonRearAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,
954954
: carAngleCockBOpen ? RearAngleCockOpened
955955
: RearAngleCockClosed;
956956

957-
Click += new Action<Control, Point>(buttonRearAngleCock_Click);
958-
}
957+
Click += new Action<Control, Point>(buttonRearAngleCock_Click);
958+
}
959959
Source = new Rectangle(0, 0, size, size);
960960
}
961961

Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,8 @@ void AddSpace()
481481
}
482482
if (isElectricDieselLocomotive)
483483
{
484-
line.Add(new buttonToggleMU(0, 0, SymbolSize, Owner.Viewer, carPosition));
485-
AddSpace();
484+
line.Add(new buttonToggleMU(0, 0, SymbolSize, Owner.Viewer, carPosition));
485+
AddSpace();
486486

487487
line.Add(new buttonTogglePower(0, 0, SymbolSize, Owner.Viewer, carPosition));
488488
AddSpace();
@@ -691,7 +691,7 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
691691
var batteyStatusChanged = wagon.PowerSupply.BatterySwitch.On != BatterySwitchOn;
692692

693693
if (powerSupplyStatusChanged || batteyStatusChanged)
694-
{
694+
{
695695
if (wagon is MSTSLocomotive) PowerSupplyStatus = (wagon as MSTSLocomotive).LocomotivePowerSupply.GetPowerStatus();
696696
BatterySwitchOn = wagon.PowerSupply.BatterySwitch.On;
697697
Layout();

0 commit comments

Comments
 (0)