Skip to content

Commit d48a9d9

Browse files
committed
Automatic merge of T1.5.1-1076-g60df6ba81e and 21 pull requests
- 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 8f695a4: Blueprint/train car operations UI window - Pull request #885 at e267870: feat: Add notifications to Menu - Pull request #891 at 9a1d6b2: Auto save - 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 #900 at c27f32d: DMI updates - Pull request #903 at 3e390b8: Downloading route content (Github, zip) - Pull request #922 at a3bc9e7: Autopilot for timetable mode - Pull request #946 at 91a03af: Advanced track sounds - Pull request #952 at 8347095: Investigation - Pulsing graphics - Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes - Pull request #954 at 84c2f4b: Add Support for Multiple Track Profiles - Pull request #959 at 2452cb0: Fix TrackViewer crash on big zoom value - Pull request #962 at 46d0472: Fix pantographs on unpowered cars - Pull request #964 at b11c894: fix: Warning CA1417: Do not use the 'OutAttribute' for string parameter - Pull request #965 at 7554f02: style: Renormalize line endings - Pull request #966 at 6353e03: fix: Warning CS0618: 'string.Copy(string)' is obsolete - Pull request #968 at 1ccdf71: Initial build of adding track section identifier for rack railway
23 parents 674df16 + 60df6ba + dfc715e + d00beb9 + f92de76 + 8f695a4 + e267870 + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + 3e390b8 + a3bc9e7 + 91a03af + 8347095 + a519452 + 84c2f4b + 2452cb0 + 46d0472 + b11c894 + 7554f02 + 6353e03 + 1ccdf71 commit d48a9d9

File tree

1 file changed

+2
-2
lines changed
  • Source/Orts.Simulation/Simulation/RollingStocks

1 file changed

+2
-2
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,7 @@ public Direction Direction
601601
public float FrictionBrakeBlendingMaxForceN; // This is the maximum force for the friction barke when it is blended with the dynamic brake
602602

603603
public bool CogWheelFitted = false;
604+
bool isRackRailway = false;
604605

605606
// Sum of all the forces acting on a Traincar in the direction of driving.
606607
// MotiveForceN and GravityForceN act to accelerate the train. The others act to brake the train.
@@ -1110,7 +1111,7 @@ public virtual void UpdateBrakeSlideCalculation()
11101111

11111112
// Only apply slide, and advanced brake friction, if advanced adhesion is selected, simplecontrolphysics is not set, and it is a Player train
11121113
// Rack stock with cog wheel fitted will not skid
1113-
if (Simulator.UseAdvancedAdhesion && !Simulator.Settings.SimpleControlPhysics && IsPlayerTrain && !CogWheelFitted)
1114+
if (Simulator.UseAdvancedAdhesion && !Simulator.Settings.SimpleControlPhysics && IsPlayerTrain && !(CogWheelFitted && isRackRailway))
11141115
{
11151116

11161117
// ************ Check if diesel or electric - assumed already be cover by advanced adhesion model *********
@@ -2992,7 +2993,6 @@ internal void UpdatedTraveler(Traveller traveler, float elapsedTimeS, float dist
29922993

29932994
if (this is MSTSWagon wagon)
29942995
{
2995-
bool isRackRailway = false;
29962996
var thisSection = traveler.GetCurrentSection();
29972997

29982998
if (thisSection != null && Simulator.TSectionDat.TrackShapes.ContainsKey(thisSection.ShapeIndex))

0 commit comments

Comments
 (0)