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

usage of whichpm in new gender code required a null ptr guard

Browse Source
This commit is contained in:
nhmall
2020-12-29 17:49:30 -05:00
parent 9c6a65f49b
commit 00c9277cfe
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/read.c
+2 -1
View File
@@ -2591,7 +2591,8 @@ struct _create_particular_data *d;
if (d->genderconf == -1) { if (d->genderconf == -1) {
/* no confict exists between explicit gender term and /* no confict exists between explicit gender term and
the specified monster name */ the specified monster name */
if (d->fem != -1 && !is_male(whichpm) && !is_female(whichpm)) if (d->fem != -1
&& (!whichpm || (!is_male(whichpm) && !is_female(whichpm))))
mmflags |= (d->fem == FEMALE) ? MM_FEMALE mmflags |= (d->fem == FEMALE) ? MM_FEMALE
: (d->fem == MALE) ? MM_MALE : 0; : (d->fem == MALE) ? MM_MALE : 0;
} else { } else {