Skip to content

Commit

Permalink
Automatic merge of T1.4-429-g9045aba196 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 75bf3a4:  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 121de22: 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 #634 at 1a44f03: Out of range exception with >= 256 cab controls
  • Loading branch information
openrails-bot committed Mar 31, 2022
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion Source/Documentation/Manual/driving.rst
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ unchecked, but don't have any effect on activity evaluation.
A tab named "Evaluation" is present on the F1 Help Information Monitor.
Once the activity is running it displays dynamic information about the player
train performance up to that moment.


.. image:: images/dbfeval-evaluation-ini.png
:scale: 100%
Expand Down
42 changes: 21 additions & 21 deletions Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -424,28 +424,28 @@ public static void Save()
}

private static void SaveEvaluation(BinaryWriter outf)
{
outf.Write(ActivityTaskPassengerStopAt.DbfEvalDepartBeforeBoarding.Count);
for (int i = 0; i < ActivityTaskPassengerStopAt.DbfEvalDepartBeforeBoarding.Count; i++)
{
{
outf.Write(ActivityTaskPassengerStopAt.DbfEvalDepartBeforeBoarding.Count);
for (int i = 0; i < ActivityTaskPassengerStopAt.DbfEvalDepartBeforeBoarding.Count; i++)
{
outf.Write((string)ActivityTaskPassengerStopAt.DbfEvalDepartBeforeBoarding[i]);
}
outf.Write(Popups.TrackMonitor.DbfEvalOverSpeed);
outf.Write(Popups.TrackMonitor.DbfEvalOverSpeedTimeS);
outf.Write(Popups.TrackMonitor.DbfEvalIniOverSpeedTimeS);
outf.Write(RollingStock.MSTSLocomotiveViewer.DbfEvalEBPBmoving);
outf.Write(RollingStock.MSTSLocomotiveViewer.DbfEvalEBPBstopped);
outf.Write(Simulation.Physics.Train.NumOfCouplerBreaks);
outf.Write(Simulation.RollingStocks.MSTSLocomotive.DbfEvalFullTrainBrakeUnder8kmh);
outf.Write(Simulation.RollingStocks.SubSystems.ScriptedTrainControlSystem.DbfevalFullBrakeAbove16kmh);
outf.Write(Simulation.RollingStocks.TrainCar.DbfEvalTrainOverturned);
outf.Write(Simulation.RollingStocks.TrainCar.DbfEvalTravellingTooFast);
outf.Write(Simulation.RollingStocks.TrainCar.DbfEvalTravellingTooFastSnappedBrakeHose);
outf.Write(Simulator.DbfEvalOverSpeedCoupling);
outf.Write(Viewer.DbfEvalAutoPilotTimeS);
outf.Write(Viewer.DbfEvalIniAutoPilotTimeS);
outf.Write(Simulator.PlayerLocomotive.DistanceM + Popups.HelpWindow.DbfEvalDistanceTravelled);
}
}
outf.Write(Popups.TrackMonitor.DbfEvalOverSpeed);
outf.Write(Popups.TrackMonitor.DbfEvalOverSpeedTimeS);
outf.Write(Popups.TrackMonitor.DbfEvalIniOverSpeedTimeS);
outf.Write(RollingStock.MSTSLocomotiveViewer.DbfEvalEBPBmoving);
outf.Write(RollingStock.MSTSLocomotiveViewer.DbfEvalEBPBstopped);
outf.Write(Simulation.Physics.Train.NumOfCouplerBreaks);
outf.Write(Simulation.RollingStocks.MSTSLocomotive.DbfEvalFullTrainBrakeUnder8kmh);
outf.Write(Simulation.RollingStocks.SubSystems.ScriptedTrainControlSystem.DbfevalFullBrakeAbove16kmh);
outf.Write(Simulation.RollingStocks.TrainCar.DbfEvalTrainOverturned);
outf.Write(Simulation.RollingStocks.TrainCar.DbfEvalTravellingTooFast);
outf.Write(Simulation.RollingStocks.TrainCar.DbfEvalTravellingTooFastSnappedBrakeHose);
outf.Write(Simulator.DbfEvalOverSpeedCoupling);
outf.Write(Viewer.DbfEvalAutoPilotTimeS);
outf.Write(Viewer.DbfEvalIniAutoPilotTimeS);
outf.Write(Simulator.PlayerLocomotive.DistanceM + Popups.HelpWindow.DbfEvalDistanceTravelled);
}

/// <summary>
/// Resume a saved game.
Expand Down

0 comments on commit 10cfc02

Please sign in to comment.