Skip to content

Commit 7ad68c6

Browse files
committed
Merge branch 'fix-readme-typos' into 'master'
Fix grammar and consistency issues in README See merge request OpenMW/openmw!4994
2 parents e7b954a + 6d461c4 commit 7ad68c6

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

README.md

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Font Licenses:
2020
Current Status
2121
--------------
2222

23-
The main quests in Morrowind, Tribunal and Bloodmoon are all completable. Some issues with side quests are to be expected (but rare). Check the [bug tracker](https://gitlab.com/OpenMW/openmw/-/issues/?milestone_title=openmw-1.0) for a list of issues we need to resolve before the "1.0" release. Even before the "1.0" release however, OpenMW boasts some new [features](https://wiki.openmw.org/index.php?title=Features), such as improved graphics and user interfaces.
23+
The main quests in Morrowind, Tribunal and Bloodmoon are all completable. Some issues with side quests are to be expected (but rare). Check the [bug tracker](https://gitlab.com/OpenMW/openmw/-/issues/?milestone_title=openmw-1.0) for a list of issues we need to resolve before the "1.0" release. Even before the "1.0" release, however, OpenMW boasts some new [features](https://wiki.openmw.org/index.php?title=Features), such as improved graphics and user interfaces.
2424

2525
Pre-existing modifications created for the original Morrowind engine can be hit-and-miss. The OpenMW script compiler performs more thorough error-checking than Morrowind does, meaning that a mod created for Morrowind may not necessarily run in OpenMW. Some mods also rely on quirky behaviour or engine bugs in order to work. We are considering such compatibility issues on a case-by-case basis - in some cases adding a workaround to OpenMW may be feasible, in other cases fixing the mod will be the only option. If you know of any mods that work or don't work, feel free to add them to the [Mod status](https://wiki.openmw.org/index.php?title=Mod_status) wiki page.
2626

@@ -45,6 +45,14 @@ Command line options
4545

4646
Syntax: openmw <options>
4747
Allowed options:
48+
--config arg additional config directories
49+
--replace arg settings where the values from the
50+
current source should replace those
51+
from lower-priority sources instead of
52+
being appended
53+
--user-data arg set user data directory (used for
54+
saves, screenshots, etc)
55+
--resources arg (=resources) set resources directory
4856
--help print help message
4957
--version print version information and quit
5058
--data arg (=data) set data directories (later directories
@@ -54,12 +62,12 @@ Command line options
5462
--fallback-archive arg (=fallback-archive)
5563
set fallback BSA archives (later
5664
archives have higher priority)
57-
--resources arg (=resources) set resources directory
5865
--start arg set initial cell
5966
--content arg content file(s): esm/esp, or
60-
omwgame/omwaddon
67+
omwgame/omwaddon/omwscripts
68+
--groundcover arg groundcover content file(s): esm/esp,
69+
or omwgame/omwaddon
6170
--no-sound [=arg(=1)] (=0) disable all sounds
62-
--script-verbose [=arg(=1)] (=0) verbose script output
6371
--script-all [=arg(=1)] (=0) compile all scripts (excluding dialogue
6472
scripts) at startup
6573
--script-all-dialogue [=arg(=1)] (=0) compile all dialogue scripts at startup
@@ -70,8 +78,8 @@ Command line options
7078
startup
7179
--script-warn [=arg(=1)] (=1) handling of warnings when compiling
7280
scripts
73-
0 - ignore warning
74-
1 - show warning but consider script as
81+
0 - ignore warnings
82+
1 - show warnings but consider script as
7583
correctly compiled anyway
7684
2 - treat warnings as errors
7785
--load-savegame arg load a save game file on game startup
@@ -97,7 +105,7 @@ Command line options
97105
win1252 - Western European (Latin)
98106
alphabet, used by default
99107
--fallback arg fallback values
100-
--no-grab Don't grab mouse cursor
108+
--no-grab [=arg(=1)] (=0) Don't grab mouse cursor
101109
--export-fonts [=arg(=1)] (=0) Export Morrowind .fnt fonts to PNG
102110
image and XML file in current directory
103111
--activate-dist arg (=-1) activation distance override

apps/openmw/options.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ namespace OpenMW
6060

6161
addOption("script-warn", bpo::value<int>()->implicit_value(1)->default_value(1),
6262
"handling of warnings when compiling scripts\n"
63-
"\t0 - ignore warning\n"
64-
"\t1 - show warning but consider script as correctly compiled anyway\n"
63+
"\t0 - ignore warnings\n"
64+
"\t1 - show warnings but consider script as correctly compiled anyway\n"
6565
"\t2 - treat warnings as errors");
6666

6767
addOption("load-savegame", bpo::value<Files::MaybeQuotedPath>()->default_value(Files::MaybeQuotedPath(), ""),

0 commit comments

Comments
 (0)