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 6c2502a0e11021227a0d63822f45ac6a9e6540b4..9971569983520283eb57a14b24a384bdb858d4d3 100644 (file)
--- 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 435609f3e5e284595f82ac8a315b73d189dab005..b42903aa54a12b5e9ad53f699ccabde30a140e4f 100644 (file)
--- 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;