Skip to content

Commit deea1f3

Browse files
committed
Automatic merge of T1.5.1-922-g0a17d985e and 15 pull requests
- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at 3ca0eb1: Blueprint/train car operations UI window - Pull request #885 at 68029a6: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #903 at 29f3d1a: Downloading route content (Github, zip) - Pull request #912 at f7b85e4: New Triple Valve Features Vol. 2 - Pull request #919 at 26cc6a8: Added mouse wheel support for controls which can be moved by pressing t… - Pull request #923 at e0f3c55: Add curve squeal to route - Pull request #924 at 6c2c3cd: Default Asset Improvements - Pull request #925 at e3b1688: Fix brakeshoe force bug - Pull request #927 at cf687d4: AI Train Power Supply/Lights Fix
17 parents 5e88bd7 + 0a17d98 + 3539862 + d00beb9 + f92de76 + 3ca0eb1 + 68029a6 + 6c0785b + 1f5ba4c + 5866028 + 29f3d1a + f7b85e4 + 26cc6a8 + e0f3c55 + 6c2c3cd + e3b1688 + cf687d4 commit deea1f3

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2049,7 +2049,6 @@ public override void Update(float elapsedClockSeconds)
20492049

20502050
TrainControlSystem.Update(elapsedClockSeconds);
20512051

2052-
LocomotivePowerSupply?.Update(elapsedClockSeconds);
20532052
UpdateControllers(elapsedClockSeconds);
20542053

20552054
// Train Heading - only check the lead locomotive otherwise flipped locomotives further in consist will overwrite the train direction
@@ -2206,6 +2205,9 @@ public override void Update(float elapsedClockSeconds)
22062205

22072206
//Force to display
22082207
FilteredMotiveForceN = CurrentFilter.Filter(MotiveForceN, elapsedClockSeconds);
2208+
2209+
// Only update power supply for player driven locomotives
2210+
LocomotivePowerSupply?.Update(elapsedClockSeconds);
22092211
break;
22102212
default:
22112213
break;

0 commit comments

Comments
 (0)