Skip to content

Commit 1af6ea1

Browse files
committed
Automatic merge of T1.5.1-992-g1383ac843 and 18 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 b3f83ed: Blueprint/train car operations UI window - Pull request #885 at 56c17fb: 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 #912 at 9305062: New Triple Valve Features Vol. 2 - Pull request #922 at abe2e52: Autopilot for timetable mode - Pull request #946 at 66f836c: Advanced track sounds - Pull request #948 at bc806e2: Fix Cycling Lights - Pull request #949 at 8ddd645: Oil Burning Locomotive - Pull request #950 at a98ff62: Ctrl-F5 showing yellow rectangles where mouse left button is active - Pull request #951 at 486081b: fix: Fix watchdog process state name - Pull request #952 at 40cf742: Investigation - Pulsing graphics part 1
20 parents ac3d33c + 1383ac8 + dfc715e + d00beb9 + f92de76 + b3f83ed + 56c17fb + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + 3e390b8 + 9305062 + abe2e52 + 66f836c + bc806e2 + 8ddd645 + a98ff62 + 486081b + 40cf742 commit 1af6ea1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Source/Orts.Simulation/Simulation/Signalling/Signals.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ public void Update(bool preUpdate)
567567
// update required part
568568
// in preupdate, process all
569569

570-
int totalSignal = SignalObjects.Length - 1;
570+
int totalSignal = foundSignals;
571571

572572
int updatestep = (totalSignal / 20) + 1;
573573
if (preUpdate)

Source/RunActivity/Viewer3D/Processes/WatchdogProcess.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// COPYRIGHT 2014 by the Open Rails project.
1+
// COPYRIGHT 2014 by the Open Rails project.
22
//
33
// This file is part of Open Rails.
44
//
@@ -36,7 +36,7 @@ namespace Orts.Viewer3D.Processes
3636
public class WatchdogProcess
3737
{
3838
readonly Profiler Profiler = new Profiler("Watchdog");
39-
readonly ProcessState State = new ProcessState("Sound");
39+
readonly ProcessState State = new ProcessState("Watchdog");
4040
readonly Game Game;
4141
readonly Thread Thread;
4242

0 commit comments

Comments
 (0)