From f0b63ae20c031c6c798c19be58c17121765488f0 Mon Sep 17 00:00:00 2001 From: PatR Date: Mon, 29 Mar 2021 09:17:33 -0700 Subject: [PATCH] 'O' vs 'altmeta' I accidentally toggled the 'altmeta' option On and got this non sequitur result when trying to toggle it back Off: |The altmeta option may not both have a value and be negated. --- doc/fixes37.0 | 3 ++- include/optlist.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/fixes37.0 b/doc/fixes37.0 index eca4bc778..867d924d6 100644 --- a/doc/fixes37.0 +++ b/doc/fixes37.0 @@ -1,4 +1,4 @@ -NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.478 $ $NHDT-Date: 1615911117 2021/03/16 16:11:57 $ +NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.488 $ $NHDT-Date: 1617034646 2021/03/29 16:17:26 $ General Fixes and Modified Features ----------------------------------- @@ -559,6 +559,7 @@ avoid segfault during error reporting for bad 'O' value(s) after theme rooms avoid complaints of "nothing to foo" for 'force_invmenu' if there are no likely candidates to foo with but there are hidden acceptable choices avoid "Not carrying anything. Never mind." for 'force_invmenu' +'altmeta' option could be toggled On but once On could not be toggled back Off curses: 'msg_window' option wasn't functional for curses unless the binary also included tty support diff --git a/include/optlist.h b/include/optlist.h index 2dc3cc940..123c5ad69 100644 --- a/include/optlist.h +++ b/include/optlist.h @@ -91,10 +91,10 @@ opt_##a, NHOPTC(altkeyhandler, 20, opt_in, set_in_game, No, Yes, No, No, NoAlias, "alternate key handler") #ifdef ALTMETA - NHOPTB(altmeta, 0, opt_out, set_in_game, Off, No, No, No, NoAlias, + NHOPTB(altmeta, 0, opt_out, set_in_game, Off, Yes, No, No, NoAlias, &iflags.altmeta) #else - NHOPTB(altmeta, 0, opt_out, set_in_config, Off, No, No, No, NoAlias, + NHOPTB(altmeta, 0, opt_out, set_in_config, Off, Yes, No, No, NoAlias, (boolean *) 0) #endif NHOPTB(ascii_map, 0, opt_in, set_in_game, Off, Yes, No, No, NoAlias,