Merge branch 'NetHack-3.7' into to500

This commit is contained in:
nhmall
2026-05-01 09:12:37 -04:00
33 changed files with 93 additions and 90 deletions
+3 -3
View File
@@ -357,7 +357,7 @@ static int optfn_##a(int, int, boolean, char *, char *);
NHOPTB(herecmd_menu, Advanced, 0, opt_in, set_in_game,
Off, Yes, No, No, NoAlias, &iflags.herecmd_menu, Term_False,
"show commands available in this location")
#if defined(MAC)
#if defined(MACOS9)
NHOPTC(hicolor, Advanced, 15, opt_in, set_in_config,
No, Yes, No, No, NoAlias,
"same as palette, only order is reversed")
@@ -390,7 +390,7 @@ static int optfn_##a(int, int, boolean, char *, char *);
NHOPTB(idlecheckpoint, Advanced, 0, opt_in, set_in_game,
Off, Yes, No, No, NoAlias, &iflags.idlecheckpoint, Term_Off,
"update checkpoint file if input is idle for 10 seconds")
#ifndef MAC
#ifndef MACOS9
NHOPTB(ignintr, Advanced, 0, opt_in, set_in_game,
Off, Yes, No, No, NoAlias, &flags.ignintr, Term_False,
"ignore interrupt signals")
@@ -542,7 +542,7 @@ static int optfn_##a(int, int, boolean, char *, char *);
No, Yes, No, No, NoAlias,
"the inventory order of the items in your pack")
#ifdef CHANGE_COLOR
#ifndef MAC /* not old Mac OS9 */
#ifndef MACOS9 /* not old Mac OS9 */
NHOPTC(palette, Advanced, 15, opt_in, set_gameview,
No, Yes, Yes, No, "hicolor",
"palette (adjust an RGB color in palette (color/R-G-B)")