fix #H4383 - blasted twice by Excalibur

...when alignment was toggled by helm of opposite alignment.  The
touch/retouch code is quite convoluted, but I think this simple
change is the right fix.
This commit is contained in:
PatR
2016-06-09 11:42:34 -07:00
parent 60b7e9bc17
commit ebd6bb62f5
2 changed files with 3 additions and 1 deletions

View File

@@ -286,6 +286,8 @@ show in inventory which monster a leash is attached to
using /? to look up something by name, supplying multiple spaces (with no using /? to look up something by name, supplying multiple spaces (with no
other characters) as the name triggered impossible "singular of null?" other characters) as the name triggered impossible "singular of null?"
add support for the 'altmeta' option to the 'what-does' command ('&' or '?f') add support for the 'altmeta' option to the 'what-does' command ('&' or '?f')
when wielded weapon becomes untouchable (after alignment change or polymorph)
hero could be 'blasted by its power' twice in succession
Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository

View File

@@ -1888,7 +1888,7 @@ boolean loseit; /* whether to drop it if hero can longer touch it */
bane = bane_applies(get_artifact(obj), &youmonst); bane = bane_applies(get_artifact(obj), &youmonst);
/* nothing else to do if hero can successfully handle this object */ /* nothing else to do if hero can successfully handle this object */
if (!ag && !bane) if (!ag && !bane && !touch_blasted)
return 1; return 1;
/* hero can't handle this object, but didn't get touch_artifact()'s /* hero can't handle this object, but didn't get touch_artifact()'s