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

follow-up - Change the terminology in mO menu

Browse Source
This commit is contained in:
nhmall
2023-02-08 00:06:56 -05:00
parent 08404ddac3
commit 6cc35abba3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/optlist.h
View File

@@ -21,7 +21,7 @@ enum OptSection {
OptS_General, OptS_Behavior, OptS_Map, OptS_Status, OptS_Advanced
};
enum menu_terminology_preference {
Term_False, Term_Off, Term_Disabled, num_terms
Term_False, Term_Off, Term_Disabled, Term_Excluded, num_terms
};
struct allopt_t {
@@ -667,7 +667,7 @@ static int optfn_##a(int, int, boolean, char *, char *);
Off, Yes, No, No, NoAlias, &iflags.voices, Term_Off)
#else
NHOPTB(voices, Advanced, 0, opt_in, set_gameview,
Off, Yes, No, No, NoAlias, &iflags.voices, Term_Disabled)
Off, Yes, No, No, NoAlias, &iflags.voices, Term_Excluded)
#endif
#ifdef TTY_TILES_ESCCODES
NHOPTB(vt_tiledata, Advanced, 0, opt_in, set_in_config,

6
src/options.c
View File

@@ -8572,13 +8572,13 @@ term_for_boolean(int idx, boolean *b)
int i, f_t = (*b) ? 1: 0;
const char *boolean_term;
static const char *const booleanterms[2][num_terms] = {
{ "false", "off", "disabled", },
{ "true", "on", "enabled", },
{ "false", "off", "disabled", "excluded from build" },
{ "true", "on", "enabled", "included"},
};
boolean_term = booleanterms[f_t][0];
i = (int) allopt[idx].termpref;
if (i > Term_False && i < num_terms)
if (i > Term_False && i < num_terms && i < SIZE(booleanterms[0]))
boolean_term = booleanterms[f_t][i];
return boolean_term;
}