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

gender for figurines

Browse Source 
Use (obj->spe & CORPSTAT_GENDER) for figurines as well as for
statues and corpses.

Support wishing for
 "{female,male,neuter} {corpse,statue,figurine} [of <monster>]".
and
 "{female,male,neuter} <monster> {corpse,statue,figurine}".
Also
 "{corpse,statue,figurine} of {female,male,neuter} <monster>"
where the qualifier might be in the middle instead of a prefix.
This commit is contained in:
PatR
2021-06-17 16:03:45 -07:00
parent 0aaafd19be
commit 0b5a112b0c
5 changed files with 76 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mondata.c
+7 -5
View File
@@ -686,13 +686,11 @@ name_to_monplus(
register int mntmp = NON_PM;
register char *s, *str, *term;
char buf[BUFSZ];
int len, slen, mgend, matchgend = NEUTRAL;
int len, slen, mgend, matchgend = -1;
boolean exact_match = FALSE;
if (remainder_p)
*remainder_p = (const char *) 0;
if (gender_name_var)
*gender_name_var = matchgend; /* NEUTRAL */
str = strcpy(buf, in_str);
@@ -848,8 +846,12 @@ name_to_monplus(
mntmp = title_to_mon(str, (int *) 0, &len);
if (len && remainder_p)
*remainder_p = in_str + (&str[len] - buf);
if (gender_name_var)
*gender_name_var = matchgend;
if (gender_name_var && matchgend != -1) {
/* don't override with neuter if caller has already specified male
or female and we've matched the neuter name */
if (*gender_name_var == -1 || matchgend != NEUTRAL)
*gender_name_var = matchgend;
}
return mntmp;
}