Skip to content

Commit 40ac510

Browse files
committed
Automatic merge of T1.5.1-797-gabb8eb9a4 and 14 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 a055bca: Blueprint/train car operations UI window - Pull request #885 at 8f94333: 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 #897 at 0a9d939: feat: Improved system information collection - Pull request #899 at 28fe751: Duplex steam engines - Booster Engine addition - Pull request #903 at 7353625: Downloading route content (Github, zip) - Pull request #907 at 9b0b04f: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel - Pull request #908 at 4b4afe3: feat: supports switching adhesion precisions - Pull request #909 at c3a572a: Correct Control Car crash bug
16 parents 0bd4776 + abb8eb9 + 3539862 + d00beb9 + f92de76 + a055bca + 8f94333 + 6c0785b + 1f5ba4c + 5866028 + 0a9d939 + 28fe751 + 7353625 + 9b0b04f + 4b4afe3 + c3a572a commit 40ac510

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/MSTSControlTrailerCar.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace Orts.Simulation.RollingStocks
4141
{
4242
public class MSTSControlTrailerCar : MSTSLocomotive
4343
{
44-
public int ControllerNumberOfGears = 1;
44+
public int ControllerNumberOfGears = 0;
4545
bool HasGearController = false;
4646
bool ControlGearUp = false;
4747
bool ControlGearDown = false;
@@ -174,7 +174,7 @@ public override void Update(float elapsedClockSeconds)
174174
{
175175
var locog = car as MSTSDieselLocomotive;
176176

177-
if (locog != null && car != this && !locog.IsLeadLocomotive() && (ControlGearDown || ControlGearUp))
177+
if (locog != null && locog.DieselEngines[0].GearBox != null && locog.DieselEngines[0].GearBox != null && car != this && !locog.IsLeadLocomotive() && (ControlGearDown || ControlGearUp))
178178
{
179179
if (ControlGearUp)
180180
{
@@ -194,7 +194,7 @@ public override void Update(float elapsedClockSeconds)
194194
}
195195

196196
// Read values for the HuD and other requirements, will be based upon the last motorcar
197-
if (locog != null)
197+
if (locog != null && locog.DieselEngines[0].GearBox != null && locog.DieselEngines[0].GearBox != null)
198198
{
199199
ControlGearIndex = locog.DieselEngines[0].GearBox.CurrentGearIndex;
200200
ControlGearIndication = locog.DieselEngines[0].GearBox.GearIndication;

0 commit comments

Comments
 (0)