From: cohrs <cohrs>
Date: Thu, 2 Oct 2003 04:23:59 +0000 (+0000)
Subject: eels in lava
X-Git-Tag: MOVE2GIT~1733
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed8ce13d8fb4c7427ab494949494e8270832214c;p=nethack

eels in lava
<Someone> reported that randomly placed aquatic monsters can end up in
lava.  The placement code allowed lava whenever the WET flag was passed to
it.  This was so passing (WET|DRY) would match all locations, but it's not
appropriate for when only the flag WET is used.  Since we have no levels
currently affected by this bug, I fixed it only in the trunk.
---

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 6c2502a0e..997156998 100644
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -33,6 +33,7 @@ can quiver coins when GOLDOBJ is defined
 grammar, spelling and other typos
 oracle and rumor regarding priestly donations
 keep various delayed killers separate to avoid mixed up messages
+don't place randomly-placed aquatic monsters in lava on special levels
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/sp_lev.c b/src/sp_lev.c
index 435609f3e..b42903aa5 100644
--- a/src/sp_lev.c
+++ b/src/sp_lev.c
@@ -222,7 +222,7 @@ register int humidity;
 		return TRUE;
 	}
 	if (humidity & WET) {
-	    if (is_pool(x,y) || is_lava(x,y))
+	    if (is_pool(x,y) || ((humidity & DRY) && is_lava(x,y)))
 		return TRUE;
 	}
 	return FALSE;