Merge branch 'shopkeeper-voice-respects-deaf' of https://github.com/copperwater/NetHack into NetHack-5.0

This commit is contained in:
nhmall
2026-06-19 10:07:11 -04:00
+7 -2
View File
@@ -262,8 +262,13 @@ ready_weapon(struct obj *wep)
if ((this_shkp = shop_keeper(inside_shop(u.ux, u.uy)))
!= (struct monst *) 0) {
pline("%s says \"You be careful with my %s!\"",
shkname(this_shkp), xname(wep));
/* check msound because we don't have access to muteshk() */
if (!Deaf && this_shkp->data->msound > MS_ANIMAL)
pline("%s says \"You be careful with my %s!\"",
shkname(this_shkp), xname(wep));
else
pline("%s looks apprehensive about your wielding %s %s.",
shkname(this_shkp), mhis(this_shkp), xname(wep));
}
}
}