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

some options handling cleanup

Browse Source 
Hide 'altkeyhandling' from the 'O' menu for !WIN32 builds.  If
present in run-time config file it will be parsed and then ignored.

Instead of showing "unknown" for the value of the 'hilite_status'
compound option, show "none" if there are no highlighting rules, or
a pointer to other option "status highlight rules" when there are.

Deal with a few function parameters that are used for some
combination of build-time config settings and unused for others.
This commit is contained in:
PatR
2022-04-06 12:08:58 -07:00
parent 6d490de39c
commit 9da36fb03e
2 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/optlist.h
View File

@@ -96,8 +96,13 @@ opt_##a,
"message window alignment")
NHOPTC(align_status, 20, opt_in, set_gameview, No, Yes, No, Yes, NoAlias,
"status window alignment")
#ifdef WIN32
NHOPTC(altkeyhandling, 20, opt_in, set_in_game, No, Yes, No, Yes,
"altkeyhandler", "alternative key handling")
#else
NHOPTC(altkeyhandling, 20, opt_in, set_in_config, No, Yes, No, Yes,
"altkeyhandler", "(not applicable)")
#endif
#ifdef ALTMETA
NHOPTB(altmeta, 0, opt_out, set_in_game, Off, Yes, No, No, NoAlias,
&iflags.altmeta)
@@ -229,6 +234,9 @@ opt_##a,
#ifdef STATUS_HILITES
NHOPTC(hilite_status, 13, opt_out, set_in_game, Yes, Yes, Yes, No, NoAlias,
"a status highlighting rule (can occur multiple times)")
#else
NHOPTC(hilite_status, 13, opt_out, set_in_config, Yes, Yes, Yes, No,
NoAlias, "(not available)")
#endif
NHOPTB(hitpointbar, 0, opt_in, set_in_game, Off, Yes, No, No, NoAlias,
&iflags.wc2_hitpointbar)