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

add a master off/on switch for sounds

Browse Source 
sounds can be set in the config file or on the fly with the Options menu.

This also adds a mechanism for specifying a terminology preference
for a boolean option in the options menu.

The choices are: Term_False, Term_Off, Term_Disabled

Term_False, the default, will use the terms "false" and "true" in the
Options menu.
Term_Off will use the terms "off" and "on" in the Options menu.
Term_Disabled will use the terms "disabled" and "enabled" in the Options
menu.

I didn't review any of the existing options to see if one of the new
alternative terms might be a better fit. They were all left at the default.
This commit is contained in:
nhmall
2023-01-30 12:07:03 -05:00
parent fe99bcd591
commit 9bbb2e17cf
6 changed files with 164 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/options.c
View File

@@ -65,9 +65,9 @@ enum opt {
static struct allopt_t allopt_init[] = {
#include "optlist.h"
{(const char *) 0, OptS_Advanced, 0, 0, 0, set_in_sysconf, BoolOpt,
No, No, No, No, 0, (boolean *) 0,
No, No, No, No, Term_False, 0, (boolean *) 0,
(int (*)(int, int, boolean, char *, char *)) 0,
(char *) 0, (const char *) 0, (const char *) 0, 0, 0, 0}
(char *) 0, (const char *) 0, (const char *) 0, 0, 0, 0 }
};
#undef NHOPT_PARSE
@@ -362,6 +362,7 @@ static boolean wc2_supported(const char *);
static void wc_set_font_name(int, char *);
static int wc_set_window_colors(char *);
static boolean illegal_menu_cmd_key(uchar);
static const char *term_for_boolean(int, boolean *);
#ifdef CURSES_GRAPHICS
extern int curses_read_attrs(const char *attrs);
extern char *curses_fmt_attrs(char *);
@@ -8565,6 +8566,23 @@ doset_simple(void)
return ECMD_OK;
}
static const char *
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", },
};
boolean_term = booleanterms[f_t][0];
i = (int) allopt[idx].termpref;
if (i > Term_False && i < num_terms)
boolean_term = booleanterms[f_t][i];
return boolean_term;
}
/* the #optionsfull command */
int
doset(void) /* changing options via menu by Per Liboriussen */
@@ -8666,7 +8684,7 @@ doset(void) /* changing options via menu by Per Liboriussen */
any.a_int = (pass == 0) ? 0 : i + 1 + indexoffset;
indent = (pass == 0 && !iflags.menu_tab_sep) ? " " : "";
Sprintf(buf, fmtstr_doset, indent,
name, *bool_p ? "true" : "false");
name, term_for_boolean(i, bool_p));
if (pass == 0)
enhance_menu_text(buf, sizeof buf, pass, bool_p,
&allopt[i]);