From: cohrs <cohrs>
Date: Sun, 24 Sep 2006 01:36:40 +0000 (+0000)
Subject: Elbereth on unoccupied locations
X-Git-Tag: MOVE2GIT~881
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13559f1ad8247d312d5e07fca1ed0d5a72b2c2a0;p=nethack

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 a1e9563e9..5a33792b9 100644
--- 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 19f252896..5806898c6 100644
--- 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;
 		}