Skip to content

Commit abb56c8

Browse files
committed
Automatic merge of T1.5.1-594-g5f7e60929 and 11 pull requests
- Pull request #757 at 98dd1a7: Unify RailDriver code implementations - Pull request #831 at f6ca1e1: poor mans switch panel on tablet - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #853 at d05f581: Notify out of focus - Pull request #855 at b39e5d8: Adds new route from TrainSimulations - Pull request #857 at 9afc8c3: Adding Air Flow Meters - Pull request #865 at 776d6df: Dispatcher window improvements - Pull request #866 at c15333e: Fix Articulation For 0-Axle Train Cars - Pull request #870 at 5cb32fa: Fix water restore - Pull request #873 at cf0ed99: Reduce allocations in signal script - Pull request #874 at d500329: Dynamic brake controller refactoring
13 parents 6971c40 + 5f7e609 + 98dd1a7 + f6ca1e1 + d00beb9 + d05f581 + b39e5d8 + 9afc8c3 + 776d6df + c15333e + 5cb32fa + cf0ed99 + d500329 commit abb56c8

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2881,19 +2881,19 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
28812881
switch (ControlDiscrete.ControlType.Type)
28822882
{
28832883
case CABViewControlTypes.ORTS_2DEXTERNALWIPERS:
2884-
var halfCycleS = CycleTimeS / 2f;
2885-
if (AnimationOn)
2886-
{
2887-
CumulativeTime += elapsedTime.ClockSeconds;
2888-
if (CumulativeTime > CycleTimeS && !animate)
2889-
AnimationOn = false;
2890-
CumulativeTime %= CycleTimeS;
2884+
var halfCycleS = CycleTimeS / 2f;
2885+
if (AnimationOn)
2886+
{
2887+
CumulativeTime += elapsedTime.ClockSeconds;
2888+
if (CumulativeTime > CycleTimeS && !animate)
2889+
AnimationOn = false;
2890+
CumulativeTime %= CycleTimeS;
28912891

2892-
if (CumulativeTime < halfCycleS)
2893-
index = PercentToIndex(CumulativeTime / halfCycleS);
2894-
else
2895-
index = PercentToIndex((CycleTimeS - CumulativeTime) / halfCycleS);
2896-
}
2892+
if (CumulativeTime < halfCycleS)
2893+
index = PercentToIndex(CumulativeTime / halfCycleS);
2894+
else
2895+
index = PercentToIndex((CycleTimeS - CumulativeTime) / halfCycleS);
2896+
}
28972897
break;
28982898

28992899
case CABViewControlTypes.ORTS_2DEXTERNALLEFTWINDOW:
@@ -2923,8 +2923,8 @@ public override void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
29232923
CumulativeTime = 0;
29242924
}
29252925
}
2926-
else
2927-
{
2926+
else
2927+
{
29282928
index = PercentToIndex((CycleTimeS - CumulativeTime) / CycleTimeS);
29292929
Locomotive.SoundHeardInternallyCorrection[soundCorrectionIndex] = (CycleTimeS - CumulativeTime) / CycleTimeS;
29302930
if (!AnimationOn)

0 commit comments

Comments
 (0)