Merge NetHack 3.6 updates into NetHack-3.7

diff --cc .travis.yml
index dd9c6903b83a8e4fa17d7a5e81b0a21098422e14,8755374426bda95d1b30b7cdb2d1aee52e967694..5a566fbe523fc4c6487b43657b2f29af837b3356
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -164,6 -112,6 +164,6 @@@ deploy
    skip_cleanup: true
    on:
      tags: true
-   prerelease: true
+   prerelease: false
 -  name: "Release build of NetHack 3.6.6"
 -  body: "This is an auto generated Release build of NetHack 3.6.6"
 +  name: "Pre-Release build of NetHack 3.7.0"
 +  body: "This is an auto generated Pre-Release build of NetHack 3.7.0"

diff --cc src/mhitm.c
index 181dd848344b1fc138df94879fee9ddc0075c242,5ebbd84296aba4ebc94f0bf23d391a3b04798488..d94b11db0ad57bc607fee892f37c90a4d33b200b
--- 1/src/mhitm.c
--- 2/src/mhitm.c
+++ b/src/mhitm.c
@@@ -943,14 -968,8 +943,8 @@@ register struct attack *mattk
      case AD_HEAL:
      case AD_PHYS:
   physical:
-         /* this shade check is necessary in case any attacks which
-            dish out physical damage bypass hitmm() to get here */
-         if ((mattk->aatyp == AT_WEAP || mattk->aatyp == AT_CLAW) && g.otmp)
-             dmgwep = *g.otmp;
-         else
-             dmgwep = cg.zeroobj;
- 
-         if (shade_miss(magr, mdef, &dmgwep, FALSE, TRUE)) {
 -        obj = (mattk->aatyp == AT_WEAP || mattk->aatyp == AT_CLAW) ? otmp : 0;
++        obj = (mattk->aatyp == AT_WEAP || mattk->aatyp == AT_CLAW) ? g.otmp : 0;
+         if (shade_miss(magr, mdef, obj, FALSE, TRUE)) {
              tmp = 0;
          } else if (mattk->aatyp == AT_KICK && thick_skinned(pd)) {
              tmp = 0;