Skip to content

Commit a24a4f1

Browse files
author
Chris Jakeman
committed
Resolved conflicts and updated screenshots
1 parent 5d0be40 commit a24a4f1

File tree

6 files changed

+2
-5
lines changed

6 files changed

+2
-5
lines changed
-1.22 KB
Loading
-4.31 KB
Loading
-1.61 KB
Loading

Source/Documentation/Manual/options.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ These windows use the abbreviations *t-us* for short tons (2000 lb),
101101
Note: The units displayed by the :ref:`F4 Track Monitor <driving-track-monitor>` (e.g. velocity and
102102
distance) are always based on data read from the route files.
103103

104-
Enable TCS scripts
104+
Use TCS scripts
105105
-------------------
106106

107-
This option enables the train control system scripts for locomotives where
107+
This option uses the train control system scripts for locomotives where
108108
these have been implemented.
109109

110110

Source/Menu/MainForm.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,6 @@ void buttonStartMP_Click(object sender, EventArgs e)
651651
void LoadOptions()
652652
{
653653
checkBoxWarnings.Checked = Settings.Logging;
654-
checkBoxWindowed.Checked = !Settings.FullScreen;
655654
radioButtonModeActivity.Checked = Settings.IsModeActivity;
656655
radioButtonModeTimetable.Checked = !Settings.IsModeActivity;
657656

Source/ORTS.Settings/UserSettings.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,6 @@ public enum DirectXFeature
139139
// Main menu settings:
140140
[Default(true)]
141141
public bool Logging { get; set; }
142-
[Default(false)]
143-
public bool FullScreen { get; set; }
144142
[Default("")]
145143
public string Multiplayer_User { get; set; }
146144
[Default("127.0.0.1")]

0 commit comments

Comments
 (0)