Skip to content

Commit

Permalink
Automatic merge of T1.4-rc6-10-g62fcbfa79 and 7 pull requests
Browse files Browse the repository at this point in the history
- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs
- Pull request #503 at 69a70cb: Update derailment functionality
- Pull request #508 at 9d6f01e: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls
- Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters
- Pull request #512 at 3aae640: Fixed dynamic brake being applied during standstill when dynamic brake blending is enabled
- Pull request #514 at 8bf4a09: Bug fix for https://bugs.launchpad.net/or/+bug/1946373. The keywords should not be translated.
- Pull request #515 at cd8e29f: Correct issue with compressor not turning off
  • Loading branch information
openrails-bot committed Oct 9, 2021
9 parents da6cce3 + 62fcbfa + 6bc94a9 + 69a70cb + 9d6f01e + d4d3256 + 3aae640 + 8bf4a09 + cd8e29f commit 82edfcb
Showing 1 changed file with 4 additions and 4 deletions.
Expand Up @@ -5109,16 +5109,16 @@ public virtual float GetDataOf(CabViewControl cvc)
switch (cvc.Units)
{
case CABViewControlUnits.KILOMETRES:
data = float.Parse(Math.Round(OdometerM / 1000, 0).ToString());
data = OdometerM / 1000;
break;
case CABViewControlUnits.MILES:
data = (float)Math.Round(Me.ToMi(OdometerM), 0);
data = (float)Me.ToMi(OdometerM);
break;
case CABViewControlUnits.FEET:
data = (float)Math.Round(Me.ToFt(OdometerM), 0);
data = (float)Me.ToFt(OdometerM);
break;
case CABViewControlUnits.YARDS:
data = (float)Math.Round(Me.ToYd(OdometerM), 0);
data = (float)Me.ToYd(OdometerM);
break;
case CABViewControlUnits.METRES:
default:
Expand Down

0 comments on commit 82edfcb

Please sign in to comment.