Skip to content

Commit 29f335d

Browse files
committed
Automatic merge of T1.5.1-1201-g5d239654f2 and 17 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 #885 at 8f473ce: 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 #952 at 8347095: Investigation - Pulsing graphics - Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes - Pull request #954 at e715fa4: Multiple Track Profiles & Superelevation Improvements - Pull request #962 at 46d0472: Fix pantographs on unpowered cars - Pull request #972 at e90a2aa: On Map window color changed switch or signal is not changed - Pull request #980 at a7406de: Downloading route content (Github, zip) second part - Pull request #981 at ef9b55d: Multiple type trainset lightglows - Pull request #982 at efcf19c: WEB based Switch Panel enhancement: Alerter - Pull request #983 at 202316e: WEB based Switch Panel bug: DPU window - Pull request #900 at c27f32d: DMI updates - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #984 at 0f8122e: Player train switching for timetable mode
19 parents 9dc62fd + 5d23965 + dfc715e + d00beb9 + 8f473ce + 9a1d6b2 + 1f5ba4c + 8347095 + a519452 + e715fa4 + 46d0472 + e90a2aa + a7406de + ef9b55d + efcf19c + 202316e + c27f32d + f92de76 + 0f8122e commit 29f335d

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

Source/Documentation/Manual/driving.rst

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1411,7 +1411,8 @@ Changing the Train Driven by the Player
14111411
General
14121412
-------
14131413

1414-
This function only works in activity mode, and allows the player to select
1414+
This function works in activity mode as well as in timetable mode,
1415+
and allows the player to select
14151416
another (existing) train from a list and to start driving it.
14161417

14171418
This function can be called more than once. A new information window has
@@ -1453,17 +1454,20 @@ completely appeared on the screen - if it is far away from the player train
14531454
this can require several seconds to load the *world* around the train) the
14541455
switch of control occurs.
14551456

1456-
The AI train string now becomes red and is moved to the first position.The
1457-
train can be driven, or set to autopilot mode. The former player train
1458-
becomes an AI train.
1457+
The AI train string now becomes red and is moved to the first position.
1458+
In timetable mode the new player train is automatically set to autopilot mode,
1459+
while this does not apply to activity mode. However in both timetable and
1460+
activity mode the player can switch forth and back to autopilot mode.
1461+
The former player train becomes an AI train.
14591462

14601463
Here is the final situation:
14611464

14621465
.. image:: images/driving-train-list-3.png
14631466
:align: center
14641467
:scale: 80%
14651468

1466-
If the second left-click was performed with the Shift key down, the former
1469+
In activity mode only, if the second left-click was performed with the Shift
1470+
key down, the former
14671471
player train still becomes an AI train, but it is put in a suspended mode
14681472
(only if its speed is 0). It won't move until it becomes a player train
14691473
again. A suspended train is shown in orange color on the Train List window.
@@ -1472,7 +1476,8 @@ The new player train can can be switched to manual mode, can also request to
14721476
pass signals at danger with the ``<Tab>`` command, and can be moved outside
14731477
of its original path. However before switching control to still another train,
14741478
the new player train must be returned to the original path or put in suspend
1475-
mode; or else it will disappear, as occurs for AI trains running outside their
1479+
mode (last is possible only in activity mode); or else it will disappear,
1480+
as occurs for AI trains running outside their
14761481
path.
14771482

14781483
The sequence may be restarted to switch to a new train or to switch back to
@@ -1482,15 +1487,9 @@ Train switching also works in activity mode together with multiplayer mode,
14821487
in the sense that the dispatcher player can switch its played train, and
14831488
the related information is sent to the client players.
14841489

1485-
The Train List window is also available in
1486-
:ref:`Timetable mode <start-timetable>`. In this case the
1487-
names of all trains except the player train are shown in white (they can't
1488-
be driven), however with a single click on a train in the window the
1489-
external view cameras become linked to that train, as occurs with the Alt-9
1490-
command described :ref:`further below <driving-changing-view>`.
14911490

1492-
Switching to a static train
1493-
---------------------------
1491+
Switching to a static train (only activity mode)
1492+
------------------------------------------------
14941493

14951494
In the Train List window the drivable static consists (that is the ones
14961495
that have at least an engine provided with a cab) are also listed (in

0 commit comments

Comments
 (0)