nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Fix ceiling hiders on pools

Browse Source 
While fuzzing, I saw a sanity checking error complaining about
a ceiling hider being on top of a pool; the rock piercer was
teleported on top of the pool while it was hiding in the ceiling.

Try to be a bit more consistent when a monster is hiding in ceiling,
and if it's valid for it to be on a pool.
This commit is contained in:
Pasi Kallinen
2023-02-02 19:04:48 +02:00
parent c2a1b97627
commit 8535b248c8
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/teleport.c
View File

@@ -133,7 +133,7 @@ goodpos(
return (is_swimmer(mdat)
|| (!Is_waterlevel(&u.uz)
&& !is_waterwall(x, y)
&& !grounded(mdat)));
&& m_in_air(mtmp)));
} else if (mdat->mlet == S_EEL && rn2(13) && !ignorewater) {
return FALSE;
} else if (is_lava(x, y) && !ignorelava) {
@@ -147,8 +147,7 @@ goodpos(
&& uarmf->oerodeproof)
|| (Upolyd && likes_lava(gy.youmonst.data)));
else
return (is_floater(mdat) || is_flyer(mdat)
|| likes_lava(mdat));
return (m_in_air(mtmp) || likes_lava(mdat));
}
if (passes_walls(mdat) && may_passwall(x, y))
return TRUE;