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

Merge branch 'master' into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2019-12-06 17:52:14 -05:00
parent 31429f10cc 0c6d801148
commit fa65384ed4
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes36.4
+1
View File
@@ -9,6 +9,7 @@ General Fixes and Modified Features
GDBPATH and GREPPATH from sysconf or -D... on compilation command line were GDBPATH and GREPPATH from sysconf or -D... on compilation command line were
being processed even if PANICTRACE was disabled but only being freed being processed even if PANICTRACE was disabled but only being freed
at end of game when that was enabled 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 Fixes to Post-3.6.3 Problems that Were Exposed Via git Repository
src/trap.c
+12 -5
View File
@@ -1624,13 +1624,20 @@ struct obj *otmp;
break; break;
case POLY_TRAP: case POLY_TRAP:
if (!resists_magm(steed) && !resist(steed, WAND_CLASS, 0, NOTELL)) { if (!resists_magm(steed) && !resist(steed, WAND_CLASS, 0, NOTELL)) {
struct permonst *mdat = steed->data;
(void) newcham(steed, (struct permonst *) 0, FALSE, FALSE); (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); dismount_steed(DISMOUNT_POLY);
else } else {
You("have to adjust yourself in the saddle on %s.", char buf[BUFSZ];
x_monnam(steed, ARTICLE_A, (char *) 0, SUPPRESS_SADDLE,
FALSE)); 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; steedhit = TRUE;
break; break;