Merge branch 'NetHack-3.6'

diff --cc src/apply.c
index a5d025e3fed45384918a0afecf1b399b6e1926e6,e77984d30fefd74ddd46a6d7da7f703336c24d7b..ecaccb741470c32bd1bfa20c43f81204faa07bc5
--- 1/src/apply.c
--- 2/src/apply.c
+++ b/src/apply.c
@@@ -443,9 -449,10 +443,10 @@@ register struct obj *obj
      return res;
  }
  
- static const char whistle_str[] = "produce a %s whistling sound.";
+ static const char whistle_str[] = "produce a %s whistling sound.",
+                   alt_whistle_str[] = "produce a %s, sharp vibration.";
  
 -STATIC_OVL void
 +static void
  use_whistle(obj)
  struct obj *obj;
  {
@@@ -471,11 -477,11 +471,11 @@@ struct obj *obj
  {
      register struct monst *mtmp, *nextmon;
  
 -    if (!can_blow(&youmonst)) {
 +    if (!can_blow(&g.youmonst)) {
          You("are incapable of using the whistle.");
      } else if (obj->cursed && !rn2(2)) {
-         You("produce a %shigh-pitched humming noise.",
-             Underwater ? "very " : "");
+         You("produce a %shigh-%s.", Underwater ? "very " : "",
+             Deaf ? "frequency vibration" : "pitched humming noise");
          wake_nearby();
      } else {
          int pet_cnt = 0, omx, omy;