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

Use grounded macro

Browse Source
This commit is contained in:
Pasi Kallinen
2022-02-15 18:44:56 +02:00
parent b5a4f9ca65
commit e65c921ccb
6 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mon.c
View File

@@ -1780,12 +1780,11 @@ mfndpos(
nodiag = NODIAG(mdat - mons);
wantpool = (mdat->mlet == S_EEL);
poolok = ((!Is_waterlevel(&u.uz) && !(nowtyp != WATER)
&& (is_flyer(mdat) || is_floater(mdat) || is_clinger(mdat)))
&& !grounded(mdat))
|| (is_swimmer(mdat) && !wantpool));
/* note: floating eye is the only is_floater() so this could be
simplified, but then adding another floater would be error prone */
lavaok = (is_flyer(mdat) || is_floater(mdat) || is_clinger(mdat)
|| likes_lava(mdat));
lavaok = (!grounded(mdat) || likes_lava(mdat));
if (mdat == &mons[PM_FLOATING_EYE]) /* prefers to avoid heat */
lavaok = FALSE;
thrudoor = ((flag & (ALLOW_WALL | BUSTDOOR)) != 0L);