Elbereth on unoccupied locations

Pat recently forwarded a discussion that Elbereth was ignored unless there
was an object on its location.  Mostly.  It was also respected if the hero
was Displaced, no matter where the hero was.  No one commented on his
message, which I took for assent to address this.  Removed the qualifiers, so
now Elbereth is always respected, just like a scroll of scare monster.

diff --git a/doc/fixes34.4 b/doc/fixes34.4
index a1e9563e9b5851075ca1d5060ea1a558597bee0d..5a33792b9c8ef5b58d2eb73f8a7941cb734206e3 100644 (file)
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -258,6 +258,7 @@ prevent obj_is_local panic during bones creation when splatter_burning_oil()
 fix region timeout detection, caused strange display of stinking cloud
        while wearing the Eyes of the Overworld
 try to keep migrating monsters from escaping the wizard tower
+affected monsters should always respect "Elbereth"
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/mon.c b/src/mon.c
index 19f2528962ba308e2472e9644a72ee8259067758..5806898c6448b2cad9ebf7d889bfb1af5026beaa 100644 (file)
--- a/src/mon.c
+++ b/src/mon.c
@@ -1081,7 +1081,7 @@ nexttry:  /* eels prefer the water, but if there is no water nearby,
                }
 
                info[cnt] = 0;
-               if ((checkobj || Displaced) && onscary(dispx, dispy, mon)) {
+               if (onscary(dispx, dispy, mon)) {
                    if(!(flag & ALLOW_SSM)) continue;
                    info[cnt] |= ALLOW_SSM;
                }