article fix for polymorphing steed

This commit is contained in:
nhmall
2019-12-06 17:50:59 -05:00
parent 7a3ce901ab
commit a7ac5ce7f3
2 changed files with 13 additions and 5 deletions

View File

@@ -9,6 +9,7 @@ General Fixes and Modified Features
GDBPATH and GREPPATH from sysconf or -D... on compilation command line were
being processed even if PANICTRACE was disabled but only being freed
at end of game when that was enabled
fix the article used in the message when your steed encounters a polymorph trap
Fixes to Post-3.6.3 Problems that Were Exposed Via git Repository

View File

@@ -1627,13 +1627,20 @@ struct obj *otmp;
break;
case POLY_TRAP:
if (!resists_magm(steed) && !resist(steed, WAND_CLASS, 0, NOTELL)) {
struct permonst *mdat = steed->data;
(void) newcham(steed, (struct permonst *) 0, FALSE, FALSE);
if (!can_saddle(steed) || !can_ride(steed))
if (!can_saddle(steed) || !can_ride(steed)) {
dismount_steed(DISMOUNT_POLY);
else
You("have to adjust yourself in the saddle on %s.",
x_monnam(steed, ARTICLE_A, (char *) 0, SUPPRESS_SADDLE,
FALSE));
} else {
char buf[BUFSZ];
Strcpy(buf, x_monnam(steed, ARTICLE_YOUR, (char *) 0,
SUPPRESS_SADDLE, FALSE));
if (mdat != steed->data)
(void) strsubst(buf, "your ", "your new ");
You("have to adjust yourself in the saddle on %s.", buf);
}
}
steedhit = TRUE;
break;