cpp/openttd-patchpack/source Changeset - r27792:08474b1ace68

Changeset - r27792:08474b1ace68

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Rubidium - 11 months ago 2023-07-25 20:27:23
rubidium@openttd.org

Change: improve wording of help (host instead of IP) and update man page

2 files changed with 22 insertions and 14 deletions:

docs/openttd.6

src/openttd.cpp

0 comments (0 inline, 0 general)

docs/openttd.6

➞

Show inline comments

 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd October 13, 2014
+.Dd August 12, 2023
 .Dt OPENTTD 6
 .Os
 .Sh NAME
 .Nm openttd
 .Nd open source clone of the Microprose game \(lqTransport Tycoon Deluxe\(rq
 .Sh SYNOPSIS
 .Nm
-.Op Fl efhx
+.Op Fl efhQxX
 .Op Fl b Ar blitter
 .Op Fl c Ar config_file
 .Op Fl d Op Ar level | Ar cat Ns = Ns Ar lvl Ns Op , Ns Ar ...
 .Op Fl D Oo Ar host Oc Ns Op : Ns Ar port
 .Op Fl g Op Ar savegame
 .Op Fl G Ar seed
 .Op Fl I Ar graphicsset
 .Op Fl l Ar host Ns Op : Ns Ar port
 .Op Fl m Ar driver
 .Op Fl M Ar musicset
-.Op Fl n Ar host Ns Oo : Ns Ar port Oc Ns Op # Ns Ar player
+.Op Fl n Ar host Ns Oo : Ns Ar port Oc Ns Op # Ns Ar company
 .Op Fl p Ar password
 .Op Fl P Ar password
 .Op Fl q Ar savegame
 .Op Fl r Ar width Ns x Ns Ar height
 .Op Fl s Ar driver
 .Op Fl S Ar soundset
 .Op Fl t Ar year
 .Op Fl v Ar driver
 .Sh OPTIONS
-.Bl -tag -width "-n host[:port][#player]"
+.Bl -tag -width "-n host[:port][#company]"
 .It Fl b Ar blitter
 Select the blitter
 .Ar blitter ;
 see
 .Fl h
 for a full list.
@@ @@ -80,41 +80,47 @@ sound, music and video drivers, graphics @@
 Select the graphics set
 .Ar graphicsset ;
 see
 .Fl h
 for a full list.
 .It Fl l Ar host Ns Op : Ns Ar port
 Redirect
 .Fn DEBUG
 output; see
 .Fl D .
 Redirect debug output; see
 .Fl d .
 .It Fl m Ar driver
 Select the music driver
 .Ar driver ;
 see
 .Fl h
 for a full list.
 .It Fl M Ar musicset
 Select the music set
 .Ar musicset ;
 see
 .Fl h
 for a full list.
 .It Fl n Ar host Ns Oo : Ns Ar port Oc Ns Op # Ns Ar player
 Join a network game, optionally specifying a port to connect to and player to
 .It Fl n Ar host Ns Oo : Ns Ar port Oc Ns Op # Ns Ar company
 Join a network game, optionally specifying a port to connect to and company to
 play as.
 .It Fl p Ar password
 Password used to join server.
 Only useful with
 .Fl n .
 .It Fl P Ar password
 Password used to join company.
 Only useful with
 .Fl n .
 .It Fl q Ar savegame
 Write some information about the specified savegame and exit.
 .It Fl Q
 Don't scan for/load NewGRF files on startup.
 .Pp
 Passing
 .Fl Q
 twice (so,
 .Fl QQ
 ) will disable NewGRF scanning/loading entirely.
 .It Fl r Ar width Ns x Ns Ar height
 Set the resolution to
 .Ar width
 \(mu
 .Ar height
 pixels.
@@ @@ -138,12 +144,14 @@ Select the video driver @@
 .Ar driver ;
 see
 .Fl h
 for a full list.
 .It Fl x
 Do not automatically save to config file on exit.
 .It Fl X
 Do not use global folders to search for files.
 .El
 .Sh SEE ALSO
 .Lk https://wiki.openttd.org "Wiki"
 (includes community maintained manual),
 .Lk https://forum.openttd.org "Forum",
 .Lk https://www.openttd.org "News"

src/openttd.cpp

➞

Show inline comments

@@ @@ -163,17 +163,17 @@ static void ShowHelp() @@
 		"  -h                  = Display this help text\n"
 		"  -t year             = Set starting year\n"
 		"  -d [[fac=]lvl[,...]]= Debug mode\n"
 		"  -e                  = Start Editor\n"
 		"  -g [savegame]       = Start new/save game immediately\n"
 		"  -G seed             = Set random seed\n"
-		"  -n ip[:port][#company]= Join network game\n"
+		"  -n host[:port][#company]= Join network game\n"
 		"  -p password         = Password to join server\n"
 		"  -P password         = Password to join company\n"
 		"  -D [ip][:port]      = Start dedicated server\n"
 		"  -l ip[:port]        = Redirect Debug()\n"
 		"  -D [host][:port]    = Start dedicated server\n"
 		"  -l host[:port]      = Redirect Debug()\n"
 #if !defined(_WIN32)
 		"  -f                  = Fork into the background (dedicated only)\n"
 #endif
 		"  -I graphics_set     = Force the graphics set (see below)\n"
 		"  -S sounds_set       = Force the sounds set (see below)\n"
 		"  -M music_set        = Force the music set (see below)\n"
@@ @@ -545,13 +545,13 @@ int openttd_main(int argc, char *argv[]) @@
 			if (mgo.opt != nullptr) {
 				scanner->dedicated_host = ParseFullConnectionString(mgo.opt, scanner->dedicated_port);
+			}
 			break;
 		case 'f': _dedicated_forks = true; break;
 		case 'n':
-			scanner->connection_string = mgo.opt; // IP:port#company parameter
+			scanner->connection_string = mgo.opt; // host:port#company parameter
 			break;
 		case 'l':
 			debuglog_conn = mgo.opt;
 			break;
 		case 'p':
 			scanner->join_server_password = mgo.opt;

0 comments (0 inline, 0 general)