Skip to content

Commit

Permalink
Automatic merge of T1.4-431-g76abf4e69 and 16 pull requests
Browse files Browse the repository at this point in the history
- Pull request #525 at 614b222: TCS extensions
- Pull request #613 at 39fb000: fix: Use properly FPS-independent smoothing function
- Pull request #615 at f2b6299:  Management of EOT devices  https://blueprints.launchpad.net/or/+spec/eot
- Pull request #616 at 1b168a0: Improvements in graduated/full release braking
- Pull request #617 at 99c6474: 02m: Removed menu option Debrief Evaluation. Now always available.
- Pull request #619 at ea10bfc: Adjust HuD to display relevant parameters for DM locomotive
- Pull request #620 at 67c67f1: Adjust kinietic friction calculations
- Pull request #622 at c01c4a6: Bug fix for https://bugs.launchpad.net/or/+bug/1965311. TDI: The vacuum brake value is misaligned.
- Pull request #624 at 01231e1: Menu option04 - invert controls
- Pull request #625 at b161625: Menu > Options - Change defaults for best graphics
- Pull request #627 at 69dabe4: Improve advanced adhesion model
- Pull request #629 at 34abd9c: Refined label for downloading Testing Version
- Pull request #630 at 688d0cd: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #631 at 443fc13: Get correct signal id if signal ahead is in same Track Circuit
- Pull request #633 at 7ce52a7: Removed ViewDispatcher setting
- Pull request #635 at b731488: Minor steam locomotive issues.
  • Loading branch information
openrails-bot committed Apr 3, 2022
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 29 deletions.
5 changes: 1 addition & 4 deletions Source/Orts.Simulation/Common/Commands.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2242,10 +2242,7 @@ public ToggleEOTEmergencyBrakeCommand(CommandLog log)

public override void Redo()
{
if (Receiver?.Train?.EOT != null)
{
Receiver.Train.EOT.EmergencyBrake(!Receiver.Train.EOT.EOTEmergencyBrakingOn);
}
Receiver.Train.EOT?.EmergencyBrake(!Receiver.Train.EOT.EOTEmergencyBrakingOn);
}
}

Expand Down
2 changes: 0 additions & 2 deletions Source/Orts.Simulation/Simulation/AIs/AI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -837,8 +837,6 @@ private AITrain CreateAITrain(Service_Definition sd, Traffic_Traffic_Definition
StartList.InsertTrain(train);
Simulator.StartReference.Add(train.Number);
}
// if (train.Cars[0] is MSTSLocomotive && (train.Cars[0] as MSTSLocomotive).EOTEnabled != MSTSLocomotive.EOTenabled.no)
// train.EOT = new EOT((train.Cars[0] as MSTSLocomotive).EOTEnabled, true, train);
return train;
}

Expand Down
4 changes: 0 additions & 4 deletions Source/Orts.Simulation/Simulation/Physics/Train.cs
Original file line number Diff line number Diff line change
Expand Up @@ -916,10 +916,6 @@ public Train(Simulator simulator, BinaryReader inf)
InitialSpeed = inf.ReadSingle();
IsPathless = inf.ReadBoolean();

/* var hasEOT = inf.ReadInt32();
if (hasEOT == 1)
EOT = new EOT(inf, this);*/

if (TrainType != TRAINTYPE.REMOTE)
{
// restore leadlocomotive
Expand Down
19 changes: 0 additions & 19 deletions Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/EOT.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,25 +91,6 @@ public EOT(Simulator simulator, string wagPath)
DelayTimer = new Timer(this);
}

/* public EOT(MSTSLocomotive.EOTenabled eotEnabled, bool armed, Train train)
{
Train = train;
EOTState = EOTstate.Disarmed;
EOTType = eotEnabled;
ID = IDRandom.Next(0, 99999);
if (armed)
EOTState = EOTstate.Armed;
DelayTimer = new Timer(this);
}*/

/* public EOT(BinaryReader inf, Train train)
{
Train = train;
ID = inf.ReadInt32();
EOTState = (EOTstate)(inf.ReadInt32());
DelayTimer = new Timer(this);
}*/

public override void Initialize()
{
base.Initialize();
Expand Down

0 comments on commit 4c0130c

Please sign in to comment.