diff --git a/src/mon.c b/src/mon.c index a5e626acf..5d736be1e 100644 --- a/src/mon.c +++ b/src/mon.c @@ -4760,7 +4760,7 @@ select_newcham_form(struct monst* mon) } while (--tryct > 0 && !validspecmon(mon, mndx) /* try harder to select uppercase monster on rogue level */ && (tryct > 40 && Is_rogue_level(&u.uz) - && !isupper((uchar) mons[mndx].mlet))); + && !isupper(monsym(&mons[mndx])))); } return mndx; } @@ -4865,7 +4865,7 @@ newcham( /* for the first several tries we require upper-case on the rogue level (after that, we take whatever we get) */ if (tryct > 15 && Is_rogue_level(&u.uz) - && mdat && !isupper((uchar) mdat->mlet)) + && mdat && !isupper(monsym(mdat))) mdat = 0; if (mdat) break; diff --git a/src/wizard.c b/src/wizard.c index 16473254e..26d27a782 100644 --- a/src/wizard.c +++ b/src/wizard.c @@ -522,7 +522,7 @@ pick_nasty( * but we don't try very hard. */ if (Is_rogue_level(&u.uz) - && !('A' <= mons[res].mlet && mons[res].mlet <= 'Z')) + && !('A' <= monsym(&mons[res]) && monsym(&mons[res]) <= 'Z')) res = ROLL_FROM(nasties); /* if genocided or too difficult or out of place, try a substitute