Skip to content

Commit b06551f

Browse files
committed
Automatic merge of T1.5.1-936-g6ef2a671fa and 16 pull requests
- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting - Pull request #799 at dfc715e: Consolidated wind simulation - 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 #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 7af1f91: 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 e75be0c: 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 a28da45: AI Train Power Supply/Lights Fix - Pull request #929 at a406a69: Add support for common circuit breaker variants
18 parents 0d7808e + 6ef2a67 + 3539862 + dfc715e + d00beb9 + f92de76 + 3ca0eb1 + 6c0785b + 1f5ba4c + 5866028 + 7af1f91 + f7b85e4 + 26cc6a8 + e75be0c + 6c2c3cd + e3b1688 + a28da45 + a406a69 commit b06551f

File tree

1 file changed

+2
-9
lines changed
  • Source/Orts.Simulation/Simulation/AIs

1 file changed

+2
-9
lines changed

Source/Orts.Simulation/Simulation/AIs/AI.cs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -926,18 +926,11 @@ public AITrain CreateAITrainDetail(Service_Definition sd, Traffic_Service_Defini
926926
mstsSteamLocomotive.TenderCoalMassKG = mstsSteamLocomotive.MaxTenderCoalMassKG * Simulator.Activity.Tr_Activity.Tr_Activity_Header.FuelCoal / 100.0f;
927927
}
928928

929-
if (train.InitialSpeed != 0)
930-
{
931-
car.SignalEvent(PowerSupplyEvent.RaisePantograph, 1);
932-
933-
if (car is MSTSLocomotive loco)
934-
loco.SetPower(true);
935-
}
929+
if (train.InitialSpeed != 0 && car is MSTSLocomotive loco)
930+
loco.SetPower(true);
936931
}
937932
else
938933
{
939-
car.SignalEvent(PowerSupplyEvent.RaisePantograph, 1);
940-
941934
if (car is MSTSLocomotive loco)
942935
loco.SetPower(true);
943936

0 commit comments

Comments
 (0)