From a52ff4b9463669c353c3c02f2f256f0fcd96c43f Mon Sep 17 00:00:00 2001 From: nhmall Date: Sat, 7 Mar 2020 11:32:50 -0500 Subject: [PATCH 1/4] update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f3c01596..e597b11d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,5 +113,5 @@ deploy: on: tags: true prerelease: true - name: "Post-Release build of NetHack 3.6" - body: "This is an auto generated Post-Release build of NetHack 3.6" + name: "Release build of NetHack 3.6.6" + body: "This is an auto generated Release build of NetHack 3.6.6" From 7363189b22cf094ec2a8deeb7c3a228a5e57707c Mon Sep 17 00:00:00 2001 From: nhmall Date: Sat, 7 Mar 2020 11:38:42 -0500 Subject: [PATCH 2/4] clear travis boolean prerelease flag as well --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e597b11d9..875537442 100644 --- a/.travis.yml +++ b/.travis.yml @@ -112,6 +112,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" From b069b2224aa475c479032622f25add683cf56f1e Mon Sep 17 00:00:00 2001 From: nhmall Date: Sat, 7 Mar 2020 11:45:35 -0500 Subject: [PATCH 3/4] update visual studio props file --- win/win32/vs2017/NetHackProperties.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win/win32/vs2017/NetHackProperties.props b/win/win32/vs2017/NetHackProperties.props index a2102753a..b95cec961 100644 --- a/win/win32/vs2017/NetHackProperties.props +++ b/win/win32/vs2017/NetHackProperties.props @@ -4,7 +4,7 @@ 3 6 - 5 + 6 @@ -22,4 +22,4 @@ true - \ No newline at end of file + From 44b6612fdc582d22a349e3f2f3c664dd31a674e6 Mon Sep 17 00:00:00 2001 From: PatR Date: Sat, 7 Mar 2020 10:47:51 -0800 Subject: [PATCH 4/4] mon's glorkum pass harmlessly through the shade I couldn't reproduce the problem; it appears to depend upon whether the file-scope variable 'otmp' has a stale value, and that might happen after a monster has tried to steal mon's saddle. However, the code pointed out in the report is clearly wrong. This prevents feedback of "glorkum" (with plural verb since quantity of 0 isn't 1), but the potential stale value hasn't been dealt with. --- doc/fixes36.6 | 3 ++- src/mhitm.c | 14 ++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/doc/fixes36.6 b/doc/fixes36.6 index 388e271ff..21ccaaef7 100644 --- a/doc/fixes36.6 +++ b/doc/fixes36.6 @@ -1,4 +1,4 @@ -$NHDT-Branch: NetHack-3.6-Mar2020 $:$NHDT-Revision: 1.1 $ $NHDT-Date: 1583445339 2020/03/05 21:55:39 $ +$NHDT-Branch: NetHack-3.6-Mar2020 $:$NHDT-Revision: 1.2 $ $NHDT-Date: 1583606861 2020/03/07 18:47:41 $ fixes36.6 contains a terse summary of changes made to 3.6.5 in order to produce 3.6.6 as well as any post-release fixes in binaries. @@ -12,6 +12,7 @@ formatting corpse names used internal buffers differently from formatting avoid divide by 0 crash if 'bogusmon' (file of bogus monster types) is empty avoid #wizrumorcheck crash if either 'rumors.tru' or 'rumors.fal' or both were empty when makedefs built 'rumors' +avoid "'s glorkum pass harmlessly through the shade" for weaponless mon Platform- and/or Interface-Specific Fixes or Features diff --git a/src/mhitm.c b/src/mhitm.c index 5d33df493..5ebbd8429 100644 --- a/src/mhitm.c +++ b/src/mhitm.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 mhitm.c $NHDT-Date: 1573773926 2019/11/14 23:25:26 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.118 $ */ +/* NetHack 3.6 mhitm.c $NHDT-Date: 1583606861 2020/03/07 18:47:41 $ $NHDT-Branch: NetHack-3.6-Mar2020 $:$NHDT-Revision: 1.119 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2011. */ /* NetHack may be freely redistributed. See license for details. */ @@ -860,7 +860,7 @@ mdamagem(magr, mdef, mattk) register struct monst *magr, *mdef; register struct attack *mattk; { - struct obj *obj, dmgwep; + struct obj *obj; char buf[BUFSZ]; struct permonst *pa = magr->data, *pd = mdef->data; int armpro, num, @@ -968,14 +968,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) && otmp) - dmgwep = *otmp; - else - dmgwep = zeroobj; - - if (shade_miss(magr, mdef, &dmgwep, FALSE, TRUE)) { + obj = (mattk->aatyp == AT_WEAP || mattk->aatyp == AT_CLAW) ? otmp : 0; + if (shade_miss(magr, mdef, obj, FALSE, TRUE)) { tmp = 0; } else if (mattk->aatyp == AT_KICK && thick_skinned(pd)) { tmp = 0;