fix pull request #498 - unseen demon "looks angry"

When a potentially bribable demon lord becomes angry because the
hero is wielding Excalibur or Demonbane, avoid "It looks angry"
if the demon can't be seen.  The pull request just suppressed the
message in that situation; I've added an alternate one.

Fixes #498

diff --git a/doc/fixes37.0 b/doc/fixes37.0
index 907fcbd0452cf005a908ef3be8b23f3a6aeda5c8..d1d2cf104222aacd7e42847687f365b094cde980 100644 (file)
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -491,6 +491,8 @@ some rolling boulder trap feedback was inconsistent
 change "killed by <a foo>, while {paralyzed|frozen} by <a foo>" into
        "killed by <a foo>, while {paralyzed|frozen}" if the killer caused
        hero's helplessness
+"It looks very angry" would be given if a hero wielding Excalibur or Demonbane
+       offended an unseen demon lord
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository

diff --git a/src/minion.c b/src/minion.c
index 54869a8bd0a3c05160924573087252993aa129bc..faf30590cbb5b5307fa35bcf0755c9092c12ee8a 100644 (file)
--- a/src/minion.c
+++ b/src/minion.c
@@ -225,7 +225,10 @@ demon_talk(register struct monst *mtmp)
 
     if (uwep && (uwep->oartifact == ART_EXCALIBUR
                  || uwep->oartifact == ART_DEMONBANE)) {
-        pline("%s looks very angry.", Amonnam(mtmp));
+        if (canspotmon(mtmp))
+            pline("%s looks very angry.", Amonnam(mtmp));
+        else
+            You_feel("tension building.");
         mtmp->mpeaceful = mtmp->mtame = 0;
         set_malign(mtmp);
         newsym(mtmp->mx, mtmp->my);