From: nhmall <nhmall@nethack.org>
Date: Sat, 7 Mar 2020 19:08:40 +0000 (-0500)
Subject: Merge NetHack 3.6 updates into NetHack-3.7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d2009bc8d0fd36c41602f6b6ce2723552e607e49;p=nethack

Merge NetHack 3.6 updates into NetHack-3.7
---

d2009bc8d0fd36c41602f6b6ce2723552e607e49
diff --cc .travis.yml
index dd9c6903b,875537442..5a566fbe5
--- a/.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 181dd8483,5ebbd8429..d94b11db0
--- a/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;