nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

more options help

Browse Source 
"Name of your starting pet when it is a kitten" could be
construed as meaning that it will no longer apply once the
kitten grows into a housecat.  Use "if" instead of "when".

The 'other settings' were in alphabetical order except for
"status condition fields" which presumably started out as
"condition fields".  Move it into proper place for current
description.
This commit is contained in:
PatR
2020-11-26 18:47:45 -08:00
parent 7c91c76265
commit 8d91a9f764
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dat/opthelp
View File

@@ -235,8 +235,8 @@ Compound options which may be set only on startup are:
align Your starting alignment (lawful, neutral, chaotic, [random]
or random). Many roles restrict the choice to a subset.
You may specify just the first letter.
catname name of your starting pet when it is a kitten [none]
dogname name of your starting pet when it is a little dog [none]
catname name of your starting pet if it is a kitten [none]
dogname name of your starting pet if it is a little dog [none]
Several roles who start with a dog have one whose name is
pre-set (for example, "Hachi" for Samurai), but that name
will be overridden if you specify dogname.
@@ -244,7 +244,7 @@ gender Your starting gender (male, female, or random). [random]
You may specify just the first letter. Although you can
still denote your gender using the old "male" and "female"
boolean options, the "gender" option will take precedence.
horsename name of your starting pet when it is a pony [none]
horsename name of your starting pet if it is a pony [none]
menu_* specify single character accelerators for menu commands.
Here is a list of all commands with their default keystroke
followed by a list of window-ports that implement them:

6
include/optlist.h
View File

@@ -120,7 +120,7 @@ pfx_##a,
"deprecated (use S_boulder in sym file instead)")
#endif
NHOPTC(catname, PL_PSIZ, opt_in, set_gameview, No, Yes, No, No, NoAlias,
"name of your starting pet when it is a kitten")
"name of your starting pet if it is a kitten")
#ifdef INSURANCE
NHOPTB(checkpoint, 0, opt_out, set_in_game, On, Yes, No, No, NoAlias,
&flags.ins_chkpt)
@@ -150,7 +150,7 @@ pfx_##a,
opt_in, set_in_game, Yes, Yes, No, Yes, NoAlias,
"the kinds of information to disclose at end of game")
NHOPTC(dogname, PL_PSIZ, opt_in, set_gameview, No, Yes, No, No, NoAlias,
"name of your starting pet when it is a little dog")
"name of your starting pet if it is a little dog")
NHOPTC(dungeon, MAXDCHARS + 1,opt_in, set_in_config, No, Yes, No, No,
NoAlias, "list of symbols to use in drawing the dungeon map")
NHOPTC(effects, MAXECHARS + 1, opt_in, set_in_config, No, Yes, No, No,
@@ -214,7 +214,7 @@ pfx_##a,
NHOPTB(hitpointbar, 0, opt_in, set_in_game, Off, Yes, No, No, NoAlias,
&iflags.wc2_hitpointbar)
NHOPTC(horsename, PL_PSIZ, opt_in, set_gameview, No, Yes, No, No, NoAlias,
"name of your starting pet when it is a pony")
"name of your starting pet if it is a pony")
#ifdef BACKWARD_COMPAT
NHOPTC(IBMgraphics, 70, opt_in, set_in_config, Yes, Yes, No, No, NoAlias,
"load IBMGraphics display symbols")

17
src/options.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 options.c $NHDT-Date: 1606385980 2020/11/26 10:19:40 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.481 $ */
/* NetHack 3.7 options.c $NHDT-Date: 1606445249 2020/11/27 02:47:29 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.482 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2008. */
/* NetHack may be freely redistributed. See license for details. */
@@ -246,13 +246,12 @@ static boolean FDECL(add_menu_coloring_parsed, (const char *, int, int));
static void FDECL(free_one_menu_coloring, (int));
static int NDECL(count_menucolors);
static boolean FDECL(parse_role_opts, (int, BOOLEAN_P, const char *,
char *, char **));
char *, char **));
static void FDECL(doset_add_menu, (winid, const char *, int, int));
static void FDECL(opts_add_others, (winid, const char *, int,
char *, int));
static void FDECL(opts_add_others, (winid, const char *, int, char *, int));
static int FDECL(handle_add_list_remove, (const char *, int));
static void FDECL(remove_autopickup_exception,
(struct autopickup_exception *));
(struct autopickup_exception *));
static int NDECL(count_apes);
static int NDECL(count_cond);
@@ -7401,9 +7400,9 @@ static struct other_opts {
int NDECL((*othr_count_func));
} othropt[] = {
{ "autopickup exceptions", set_in_game, OPT_OTHER_APEXC, count_apes },
{ "status condition fields", set_in_game, OPT_OTHER_COND, count_cond },
{ "menu colors", set_in_game, OPT_OTHER_MENUCOLOR, count_menucolors },
{ "message types", set_in_game, OPT_OTHER_MSGTYPE, msgtype_count },
{ "status condition fields", set_in_game, OPT_OTHER_COND, count_cond },
#ifdef STATUS_HILITES
{ "status hilite rules", set_in_game, OPT_OTHER_STATHILITE,
count_status_hilites },
@@ -8105,8 +8104,8 @@ static const char *opt_epilog[] = {
"Some of the options can only be set before the game is started;",
"those items will not be selectable in the 'O' command's menu.",
"Some options are stored in a game's save file, and will keep saved",
"values when restoring that game even if you have updated your",
"config file to change them. Such changes will matter for new games.",
"values when restoring that game even if you have updated your config-",
"uration file to change them. Such changes will matter for new games.",
"The \"other settings\" can be set with 'O', but when set within the",
"configuration file they use their own directives rather than OPTIONS.",
"See NetHack's \"Guidebook\" for details.",
@@ -8152,7 +8151,7 @@ option_help()
putstr(datawin, 0, "Other settings:");
for (i = 0; othropt[i].name; ++i) {
Sprintf(buf, "`%s'", othropt[i].name);
Sprintf(buf, " %s", othropt[i].name);
putstr(datawin, 0, buf);
}