From: PatR Date: Fri, 19 Feb 2021 07:54:30 +0000 (-0800) Subject: 'wizmgender' flag X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f48080397066d4cd65531fc22cbd81d009400545;p=nethack 'wizmgender' flag "Demote" wizmgender from an obscure wizard mode extended command to an obscure wizard mode boolean option. Behaves the same except that no message is given when the value gets toggled. --- diff --git a/doc/fixes37.0 b/doc/fixes37.0 index 6acfd16f6..5878627e6 100644 --- a/doc/fixes37.0 +++ b/doc/fixes37.0 @@ -1,4 +1,4 @@ -NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.454 $ $NHDT-Date: 1613444931 2021/02/16 03:08:51 $ +NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.455 $ $NHDT-Date: 1613721260 2021/02/19 07:54:20 $ General Fixes and Modified Features ----------------------------------- @@ -509,6 +509,7 @@ changes accompanying sorting of discoveries resulted in omitting very last change to can_reach_floor() resulted in hero being unable to reach the floor when held by a lichen panic if lua init fails +change wizard mode command #wizmgender to wizard mode option 'wizmgender' curses: 'msg_window' option wasn't functional for curses unless the binary also included tty support @@ -788,7 +789,7 @@ consolidate several monsters that differed only by their gender into their single species added wizmgender debugging command to display female monsters in red inverse; helpful for debugging gender-related matters on tty; currently ignored - on other window ports + on other window ports [later: changed from command to boolean option] record number of encountered bones levels in xlogfile add bonesless to extended conducts field in xlogfile show bones levels information in enlightenment at end of game or in explore diff --git a/include/optlist.h b/include/optlist.h index b9685c6ea..fc667ce33 100644 --- a/include/optlist.h +++ b/include/optlist.h @@ -550,6 +550,8 @@ opt_##a, "the foreground/background colors of windows") NHOPTC(windowtype, WINTYPELEN, opt_in, set_gameview, No, Yes, No, No, NoAlias, "windowing system to use (should be specified first)") + NHOPTB(wizmgender, 0, opt_in, set_wizonly, Off, Yes, No, No, NoAlias, + &iflags.wizmgender) NHOPTB(wizweight, 0, opt_in, set_wizonly, Off, Yes, No, No, NoAlias, &iflags.wizweight) NHOPTB(wraptext, 0, opt_in, set_in_game, Off, Yes, No, No, NoAlias, diff --git a/src/cmd.c b/src/cmd.c index 5abad96bb..6d42dceae 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 cmd.c $NHDT-Date: 1611952382 2021/01/29 20:33:02 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.452 $ */ +/* NetHack 3.7 cmd.c $NHDT-Date: 1613721260 2021/02/19 07:54:20 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.457 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2013. */ /* NetHack may be freely redistributed. See license for details. */ @@ -2050,8 +2050,6 @@ struct ext_func_tab extcmdlist[] = { wiz_makemap, IFBURIED | WIZMODECMD, NULL }, { C('f'), "wizmap", "map the level", wiz_map, IFBURIED | AUTOCOMPLETE | WIZMODECMD, NULL }, - { '\0', "wizmgender", "force added info about monster gender", - wiz_mgender, IFBURIED | AUTOCOMPLETE | WIZMODECMD, NULL }, { '\0', "wizrumorcheck", "verify rumor boundaries", wiz_rumor_check, IFBURIED | AUTOCOMPLETE | WIZMODECMD, NULL }, { '\0', "wizseenv", "show map locations' seen vectors", diff --git a/src/detect.c b/src/detect.c index 57c693fff..1f8c5515e 100644 --- a/src/detect.c +++ b/src/detect.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 detect.c $NHDT-Date: 1606009000 2020/11/22 01:36:40 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.123 $ */ +/* NetHack 3.7 detect.c $NHDT-Date: 1613721262 2021/02/19 07:54:22 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.131 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2018. */ /* NetHack may be freely redistributed. See license for details. */ @@ -2057,15 +2057,4 @@ reveal_terrain(int full, /* wizard|explore modes allow player return; } -int -wiz_mgender(void) -{ - iflags.wizmgender = !iflags.wizmgender; - pline("wizmgender toggled %s", iflags.wizmgender ? "on" : "off"); - if (!u.uswallow) - see_monsters(); - map_redisplay(); - return 0; /* no time */ -} - /*detect.c*/ diff --git a/src/options.c b/src/options.c index ecef4de8d..497573c46 100644 --- a/src/options.c +++ b/src/options.c @@ -1,4 +1,4 @@ -/* NetHack 3.7 options.c $NHDT-Date: 1613293046 2021/02/14 08:57:26 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.506 $ */ +/* NetHack 3.7 options.c $NHDT-Date: 1613721262 2021/02/19 07:54:22 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.507 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2008. */ /* NetHack may be freely redistributed. See license for details. */ @@ -4225,6 +4225,7 @@ optfn_boolean(int optidx, int req, boolean negated, char *opts, char *op) if (iflags.use_color) g.opt_need_redraw = TRUE; /* darkroom refresh */ break; + case opt_wizmgender: case opt_showrace: case opt_use_inverse: case opt_hilite_pile: