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

wizmgender fix

Browse Source 
The 'wizmgender' option is flagged as 'wizonly' in optlist.h but that
doesn't prevent it from being set in NETHACKOPTIONS or .nethackrc.
Apply the fix from entrez to only honor it when running in wizard
mode.
This commit is contained in:
PatR
2022-07-14 16:29:08 -07:00
parent 66dc16b61f
commit 32636099ce
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/objnam.c
View File

@@ -1340,7 +1340,7 @@ doname_base(
}
if ((obj->otyp == STATUE || obj->otyp == CORPSE || obj->otyp == FIGURINE)
&& iflags.wizmgender) {
&& wizard && iflags.wizmgender) {
int cgend = (obj->spe & CORPSTAT_GENDER),
mgend = ((cgend == CORPSTAT_MALE) ? MALE
: (cgend == CORPSTAT_FEMALE) ? FEMALE

2
win/curses/cursmain.c
View File

@@ -813,7 +813,7 @@ curses_print_glyph(
attr = A_REVERSE;
}
/* highlight female monsters (wizard mode option) */
if ((special & MG_FEMALE) && iflags.wizmgender) {
if ((special & MG_FEMALE) && wizard && iflags.wizmgender) {
attr = A_REVERSE;
}
}

2
win/tty/wintty.c
View File

@@ -4257,7 +4257,7 @@ tty_print_glyph(
to see although the Valkyrie quest ends up being hard on the eyes) */
if (((special & MG_PET) != 0 && iflags.hilite_pet)
|| ((special & MG_OBJPILE) != 0 && iflags.hilite_pile)
|| ((special & MG_FEMALE) != 0 && iflags.wizmgender)
|| ((special & MG_FEMALE) != 0 && wizard && iflags.wizmgender)
|| ((special & (MG_DETECT | MG_BW_LAVA | MG_BW_ICE)) != 0
&& iflags.use_inverse)) {
term_start_attr(ATR_INVERSE);