Merge branch 'pr775' into NetHack-3.7
This commit is contained in:
@@ -2166,8 +2166,7 @@ trapeffect_poly_trap(
|
||||
if (resists_magm(mtmp)) {
|
||||
shieldeff(mtmp->mx, mtmp->my);
|
||||
} else if (!resist(mtmp, WAND_CLASS, 0, NOTELL)) {
|
||||
(void) newcham(mtmp, (struct permonst *) 0,
|
||||
in_sight ? NC_SHOW_MSG : NO_NC_FLAGS);
|
||||
(void) newcham(mtmp, (struct permonst *) 0, NC_SHOW_MSG);
|
||||
if (in_sight)
|
||||
seetrap(trap);
|
||||
}
|
||||
@@ -2618,7 +2617,7 @@ steedintrap(struct trap* trap, struct obj* otmp)
|
||||
if (!resists_magm(steed) && !resist(steed, WAND_CLASS, 0, NOTELL)) {
|
||||
struct permonst *mdat = steed->data;
|
||||
|
||||
(void) newcham(steed, (struct permonst *) 0, NO_NC_FLAGS);
|
||||
(void) newcham(steed, (struct permonst *) 0, NC_SHOW_MSG);
|
||||
if (!can_saddle(steed) || !can_ride(steed)) {
|
||||
dismount_steed(DISMOUNT_POLY);
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user