Fix front-coupler bug.

mbm-OR · mbm-OR · commit e92be5a3610f · 2023-10-26T19:40:08.000+02:00
diff --git a/Source/RunActivity/Viewer3D/Cameras.cs b/Source/RunActivity/Viewer3D/Cameras.cs
@@ -1066,6 +1066,7 @@ protected override void OnActivate(bool sameCamera)
             var isDownCameraOutsideFront = UserInput.IsDown(UserCommand.CameraOutsideFront);
             var isDownCameraOutsideRear = UserInput.IsDown(UserCommand.CameraOutsideRear);
             var isVisibleTrainCarViewer = Viewer.TrainCarOperationsViewerWindow.Visible;
+            var trainCars = GetCameraCars();
 
             if (attachedCar == null || attachedCar.Train != Viewer.SelectedTrain || carPosition != oldCarPosition || isDownCameraOutsideFront || isDownCameraOutsideRear)
             {
@@ -1076,9 +1077,8 @@ protected override void OnActivate(bool sameCamera)
                         SetCameraCar(GetCameraCars().First());
                         oldCarPosition = 0;
                     }
-                    else if (isVisibleTrainCarViewer && carPosition >= 0)
-                    {
-                        var trainCars = GetCameraCars();
+                    else if (isVisibleTrainCarViewer && carPosition >= 0 && carPosition < trainCars.Count())
+                    {                        
                         SetCameraCar(trainCars[carPosition]);
                         oldCarPosition = carPosition;
                     }
@@ -1092,13 +1092,12 @@ protected override void OnActivate(bool sameCamera)
                 }
                 else
                 {
-                    var trainCars = GetCameraCars();
                     if (!isVisibleTrainCarViewer && isDownCameraOutsideRear)
                     {
                         SetCameraCar(GetCameraCars().Last());
                         oldCarPosition = 0;
                     }
-                    else if (isVisibleTrainCarViewer && carPosition >= 0)
+                    else if (isVisibleTrainCarViewer && carPosition >= 0 && carPosition < trainCars.Count())
                     {
                         SetCameraCar(trainCars[carPosition]);
                         oldCarPosition = carPosition;
diff --git a/Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs b/Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
@@ -25,6 +25,7 @@
 using Orts.Simulation.RollingStocks.SubSystems.Brakes;
 using Orts.Simulation.RollingStocks.SubSystems.Brakes.MSTS;
 using Orts.Simulation.RollingStocks.SubSystems.PowerSupplies;
+using Orts.Viewer3D.RollingStock;
 using ORTS.Common;
 using ORTS.Common.Input;
 using ORTS.Scripting.Api;
@@ -123,6 +124,7 @@ public struct ListLabel
         int LastPlayerTrainCars;
         bool LastPlayerLocomotiveFlippedState;
         int carPosition;
+        bool couplerFront = false;
         public TrainCarOperationsViewerWindow(WindowManager owner)
             : base(owner, Window.DecorationSize.X + CarListPadding + ((owner.TextFontDefault.Height + 12) * 20), Window.DecorationSize.Y + ((owner.TextFontDefault.Height + 12) * 2), Viewer.Catalog.GetString("Train Operations Viewer"))
         {
@@ -335,7 +337,7 @@ void AddSpace(bool full)
                         AddSpace(false);
                         if ((wagon != null) && (wagon.PowerSupply is IPowerSupply))
                         {
-                            line.Add(new ToggleBatterySwitch(0, 0, textHeight, Owner.Viewer, carPosition));
+                            line.Add(new ToggleBatterySwitch(0, 0, textHeight, Owner.Viewer, CarPosition));
                             AddSpace(false);
                         }
                     }
@@ -361,24 +363,27 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
             if (updateFull)
             {
                 var carOperations = Owner.Viewer.CarOperationsWindow;
-                var trainCarOperations = Owner.Viewer.TrainCarOperationsWindow;
-                TrainCar trainCar = Owner.Viewer.PlayerTrain.Cars[CarPosition];
-                bool isElectricDieselLocomotive = (trainCar is MSTSElectricLocomotive) || (trainCar is MSTSDieselLocomotive);
+                var trainCarOperations = Owner.Viewer.TrainCarOperationsWindow;                
 
-                if (PlayerTrain != Owner.Viewer.PlayerTrain || Owner.Viewer.PlayerTrain.Cars.Count != LastPlayerTrainCars || (Owner.Viewer.PlayerLocomotive != null &&
+                if (couplerFront || PlayerTrain != Owner.Viewer.PlayerTrain || Owner.Viewer.PlayerTrain.Cars.Count != LastPlayerTrainCars || (Owner.Viewer.PlayerLocomotive != null &&
                 LastPlayerLocomotiveFlippedState != Owner.Viewer.PlayerLocomotive.Flipped))
                 {
+                    couplerFront = false;
                     PlayerTrain = Owner.Viewer.PlayerTrain;
 
-                    if (LastPlayerTrainCars != Owner.Viewer.PlayerTrain.Cars.Count) { Visible = false; }
+                    if (LastPlayerTrainCars != Owner.Viewer.PlayerTrain.Cars.Count){ Visible = false; }
 
                     LastPlayerTrainCars = Owner.Viewer.PlayerTrain.Cars.Count;
+                    CarPosition = CarPosition >= LastPlayerTrainCars? LastPlayerTrainCars - 1: CarPosition;
                     if (Owner.Viewer.PlayerLocomotive != null) LastPlayerLocomotiveFlippedState = Owner.Viewer.PlayerLocomotive.Flipped;
  
                     Layout();
                     UpdateWindowSize();
                 }
 
+                TrainCar trainCar = Owner.Viewer.PlayerTrain.Cars[CarPosition];
+                bool isElectricDieselLocomotive = (trainCar is MSTSElectricLocomotive) || (trainCar is MSTSDieselLocomotive);
+                
                 if (carPosition != CarPosition || TrainCarOperationsChanged || carOperations.CarOperationChanged
                     || trainCarOperations.modifiedSetting || carOperations.RearBrakeHoseChanged || carOperations.FrontBrakeHoseChanged)
                 {
@@ -453,8 +458,9 @@ void TrainCarOperationsCouplerFront_Click(Control arg1, Point arg2)
                 }
                 else
                 {
-                    new UncoupleCommand(Viewer.Log, CarPosition);
-                    if (Viewer.CarOperationsWindow.CarPosition > CarPosition)
+                    new UncoupleCommand(Viewer.Log, CarPosition - 1);
+                    TrainCarViewer.couplerFront = true;
+                    if (Viewer.CarOperationsWindow.CarPosition > CarPosition - 1)
                         Viewer.CarOperationsWindow.Visible = false;
                 }
             }
diff --git a/Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs b/Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
@@ -526,8 +526,8 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
                     localScrollLayout(selectedCarPosition);
                 }
 
-                UserCommand? controlDiesel = GetPressedKey(UserCommand.ControlDieselHelper, UserCommand.ControlDieselPlayer);
-                if (controlDiesel == UserCommand.ControlDieselHelper || controlDiesel == UserCommand.ControlDieselPlayer)
+                UserCommand ? controlDiesel = GetPressedKey(UserCommand.ControlDieselHelper, UserCommand.ControlDieselPlayer, UserCommand.ControlInitializeBrakes);
+                if (controlDiesel == UserCommand.ControlDieselHelper || controlDiesel == UserCommand.ControlDieselPlayer || controlDiesel == UserCommand.ControlInitializeBrakes)
                 {
                     Layout();
                     powerSupplyStatus = Owner.Viewer.PlayerTrain.Cars[CarPosition].GetStatus();

Original file line number	Diff line number	Diff line change
`@@ -1066,6 +1066,7 @@ protected override void OnActivate(bool sameCamera)`
`1066`	`1066`	`var isDownCameraOutsideFront = UserInput.IsDown(UserCommand.CameraOutsideFront);`
`1067`	`1067`	`var isDownCameraOutsideRear = UserInput.IsDown(UserCommand.CameraOutsideRear);`
`1068`	`1068`	`var isVisibleTrainCarViewer = Viewer.TrainCarOperationsViewerWindow.Visible;`
	`1069`	`+ var trainCars = GetCameraCars();`
`1069`	`1070`
`1070`	`1071`	`if (attachedCar == null \|\| attachedCar.Train != Viewer.SelectedTrain \|\| carPosition != oldCarPosition \|\| isDownCameraOutsideFront \|\| isDownCameraOutsideRear)`
`1071`	`1072`	`{`
`@@ -1076,9 +1077,8 @@ protected override void OnActivate(bool sameCamera)`
`1076`	`1077`	`SetCameraCar(GetCameraCars().First());`
`1077`	`1078`	`oldCarPosition = 0;`
`1078`	`1079`	`}`
`1079`		`- else if (isVisibleTrainCarViewer && carPosition >= 0)`
`1080`		`- {`
`1081`		`- var trainCars = GetCameraCars();`
	`1080`	`+ else if (isVisibleTrainCarViewer && carPosition >= 0 && carPosition < trainCars.Count())`
	`1081`	`+ {`
`1082`	`1082`	`SetCameraCar(trainCars[carPosition]);`
`1083`	`1083`	`oldCarPosition = carPosition;`
`1084`	`1084`	`}`
`@@ -1092,13 +1092,12 @@ protected override void OnActivate(bool sameCamera)`
`1092`	`1092`	`}`
`1093`	`1093`	`else`
`1094`	`1094`	`{`
`1095`		`- var trainCars = GetCameraCars();`
`1096`	`1095`	`if (!isVisibleTrainCarViewer && isDownCameraOutsideRear)`
`1097`	`1096`	`{`
`1098`	`1097`	`SetCameraCar(GetCameraCars().Last());`
`1099`	`1098`	`oldCarPosition = 0;`
`1100`	`1099`	`}`
`1101`		`- else if (isVisibleTrainCarViewer && carPosition >= 0)`
	`1100`	`+ else if (isVisibleTrainCarViewer && carPosition >= 0 && carPosition < trainCars.Count())`
`1102`	`1101`	`{`
`1103`	`1102`	`SetCameraCar(trainCars[carPosition]);`
`1104`	`1103`	`oldCarPosition = carPosition;`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`using Orts.Simulation.RollingStocks.SubSystems.Brakes;`
`26`	`26`	`using Orts.Simulation.RollingStocks.SubSystems.Brakes.MSTS;`
`27`	`27`	`using Orts.Simulation.RollingStocks.SubSystems.PowerSupplies;`
	`28`	`+using Orts.Viewer3D.RollingStock;`
`28`	`29`	`using ORTS.Common;`
`29`	`30`	`using ORTS.Common.Input;`
`30`	`31`	`using ORTS.Scripting.Api;`
`@@ -123,6 +124,7 @@ public struct ListLabel`
`123`	`124`	`int LastPlayerTrainCars;`
`124`	`125`	`bool LastPlayerLocomotiveFlippedState;`
`125`	`126`	`int carPosition;`
	`127`	`+ bool couplerFront = false;`
`126`	`128`	`public TrainCarOperationsViewerWindow(WindowManager owner)`
`127`	`129`	`: base(owner, Window.DecorationSize.X + CarListPadding + ((owner.TextFontDefault.Height + 12) * 20), Window.DecorationSize.Y + ((owner.TextFontDefault.Height + 12) * 2), Viewer.Catalog.GetString("Train Operations Viewer"))`
`128`	`130`	`{`
`@@ -335,7 +337,7 @@ void AddSpace(bool full)`
`335`	`337`	`AddSpace(false);`
`336`	`338`	`if ((wagon != null) && (wagon.PowerSupply is IPowerSupply))`
`337`	`339`	`{`
`338`		`- line.Add(new ToggleBatterySwitch(0, 0, textHeight, Owner.Viewer, carPosition));`
	`340`	`+ line.Add(new ToggleBatterySwitch(0, 0, textHeight, Owner.Viewer, CarPosition));`
`339`	`341`	`AddSpace(false);`
`340`	`342`	`}`
`341`	`343`	`}`
`@@ -361,24 +363,27 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)`
`361`	`363`	`if (updateFull)`
`362`	`364`	`{`
`363`	`365`	`var carOperations = Owner.Viewer.CarOperationsWindow;`
`364`		`- var trainCarOperations = Owner.Viewer.TrainCarOperationsWindow;`
`365`		`- TrainCar trainCar = Owner.Viewer.PlayerTrain.Cars[CarPosition];`
`366`		`- bool isElectricDieselLocomotive = (trainCar is MSTSElectricLocomotive) \|\| (trainCar is MSTSDieselLocomotive);`
	`366`	`+ var trainCarOperations = Owner.Viewer.TrainCarOperationsWindow;`
`367`	`367`
`368`		`- if (PlayerTrain != Owner.Viewer.PlayerTrain \|\| Owner.Viewer.PlayerTrain.Cars.Count != LastPlayerTrainCars \|\| (Owner.Viewer.PlayerLocomotive != null &&`
	`368`	`+ if (couplerFront \|\| PlayerTrain != Owner.Viewer.PlayerTrain \|\| Owner.Viewer.PlayerTrain.Cars.Count != LastPlayerTrainCars \|\| (Owner.Viewer.PlayerLocomotive != null &&`
`369`	`369`	`LastPlayerLocomotiveFlippedState != Owner.Viewer.PlayerLocomotive.Flipped))`
`370`	`370`	`{`
	`371`	`+ couplerFront = false;`
`371`	`372`	`PlayerTrain = Owner.Viewer.PlayerTrain;`
`372`	`373`
`373`		`- if (LastPlayerTrainCars != Owner.Viewer.PlayerTrain.Cars.Count) { Visible = false; }`
	`374`	`+ if (LastPlayerTrainCars != Owner.Viewer.PlayerTrain.Cars.Count){ Visible = false; }`
`374`	`375`
`375`	`376`	`LastPlayerTrainCars = Owner.Viewer.PlayerTrain.Cars.Count;`
	`377`	`+ CarPosition = CarPosition >= LastPlayerTrainCars? LastPlayerTrainCars - 1: CarPosition;`
`376`	`378`	`if (Owner.Viewer.PlayerLocomotive != null) LastPlayerLocomotiveFlippedState = Owner.Viewer.PlayerLocomotive.Flipped;`
`377`	`379`
`378`	`380`	`Layout();`
`379`	`381`	`UpdateWindowSize();`
`380`	`382`	`}`
`381`	`383`
	`384`	`+ TrainCar trainCar = Owner.Viewer.PlayerTrain.Cars[CarPosition];`
	`385`	`+ bool isElectricDieselLocomotive = (trainCar is MSTSElectricLocomotive) \|\| (trainCar is MSTSDieselLocomotive);`
	`386`	`+`
`382`	`387`	`if (carPosition != CarPosition \|\| TrainCarOperationsChanged \|\| carOperations.CarOperationChanged`
`383`	`388`	`\|\| trainCarOperations.modifiedSetting \|\| carOperations.RearBrakeHoseChanged \|\| carOperations.FrontBrakeHoseChanged)`
`384`	`389`	`{`
`@@ -453,8 +458,9 @@ void TrainCarOperationsCouplerFront_Click(Control arg1, Point arg2)`
`453`	`458`	`}`
`454`	`459`	`else`
`455`	`460`	`{`
`456`		`- new UncoupleCommand(Viewer.Log, CarPosition);`
`457`		`- if (Viewer.CarOperationsWindow.CarPosition > CarPosition)`
	`461`	`+ new UncoupleCommand(Viewer.Log, CarPosition - 1);`
	`462`	`+ TrainCarViewer.couplerFront = true;`
	`463`	`+ if (Viewer.CarOperationsWindow.CarPosition > CarPosition - 1)`
`458`	`464`	`Viewer.CarOperationsWindow.Visible = false;`
`459`	`465`	`}`
`460`	`466`	`}`
Original file line number	Diff line number	Diff line change
`@@ -526,8 +526,8 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)`
`526`	`526`	`localScrollLayout(selectedCarPosition);`
`527`	`527`	`}`
`528`	`528`
`529`		`- UserCommand? controlDiesel = GetPressedKey(UserCommand.ControlDieselHelper, UserCommand.ControlDieselPlayer);`
`530`		`- if (controlDiesel == UserCommand.ControlDieselHelper \|\| controlDiesel == UserCommand.ControlDieselPlayer)`
	`529`	`+ UserCommand ? controlDiesel = GetPressedKey(UserCommand.ControlDieselHelper, UserCommand.ControlDieselPlayer, UserCommand.ControlInitializeBrakes);`
	`530`	`+ if (controlDiesel == UserCommand.ControlDieselHelper \|\| controlDiesel == UserCommand.ControlDieselPlayer \|\| controlDiesel == UserCommand.ControlInitializeBrakes)`
`531`	`531`	`{`
`532`	`532`	`Layout();`
`533`	`533`	`powerSupplyStatus = Owner.Viewer.PlayerTrain.Cars[CarPosition].GetStatus();`