Use IS_WATERWALL and is_waterwall

2022-02-23 12:53:09 +02:00
parent 362cb4a317
commit 5786ddadbb
15 changed files with 32 additions and 22 deletions
@@ -83,14 +83,14 @@ goodpos(int x, int y, struct monst* mtmp, long gpflags)
            if (mtmp == &g.youmonst)
                return (Swimming || Amphibious
                        || (!Is_waterlevel(&u.uz)
-                            && !(levl[x][y].typ == WATER)
+                            && !is_waterwall(x, y)
                            /* water on the Plane of Water has no surface
                               so there's no way to be on or above that */
                            && (Levitation || Flying || Wwalking)));
            else
                return (is_swimmer(mdat)
                        || (!Is_waterlevel(&u.uz)
-                            && !(levl[x][y].typ == WATER)
+                            && !is_waterwall(x, y)
                            && !grounded(mdat)));
        } else if (mdat->mlet == S_EEL && rn2(13) && !ignorewater) {
            return FALSE;