1
0
Fork 0
mirror of https://codeberg.org/noisytoot/notnotdnethack.git synced 2025-07-31 09:52:25 +01:00

Merge pull request #1445 from NeroOneTrueKing/patch-more-priestname-fixes-questionmark

Apparently we had monsters with ispriest or isminion flag and no mx
This commit is contained in:
Chris-plus-alphanumericgibberish 2021-01-28 14:26:37 -05:00 committed by GitHub
commit 97a31a4306
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -877,7 +877,7 @@ boolean called;
}
/* priests and minions: don't even use this function */
if ((mtmp->ispriest || mtmp->isminion) && mtmp->mtyp != PM_BLASPHEMOUS_LURKER) {
if ((get_mx(mtmp, MX_EPRI) || get_mx(mtmp, MX_EMIN)) && mtmp->mtyp != PM_BLASPHEMOUS_LURKER) {
char priestnambuf[BUFSZ];
char *name;
long save_prop = EHalluc_resistance;

View file

@ -343,7 +343,7 @@ register struct monst *mon;
char *pname; /* caller-supplied output buffer */
{
const char *what = Hallucination ? rndmonnam() : mon->data->mname;
int align = (mon->ispriest ? EPRI(mon)->shralign : mon->isminion ? EMIN(mon)->min_align : 0);
int align = (get_mx(mon, MX_EPRI) ? EPRI(mon)->shralign : get_mx(mon, MX_EMIN) ? EMIN(mon)->min_align : 0);
Strcpy(pname, "the ");
if (mon->minvis) Strcat(pname, "invisible ");