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
--- a/src/dothrow.c
+++ b/src/dothrow.c
@@ -851,7 +851,7 @@ hurtle_step(genericptr_t arg, int x, int y)
        switch_terrain();

    if (is_pool(x, y) && !u.uinwater) {
-        if ((Is_waterlevel(&u.uz) && levl[x][y].typ == WATER)
+        if ((Is_waterlevel(&u.uz) && is_waterwall(x,y))
            || !(Levitation || Flying || Wwalking)) {
            g.multi = 0; /* can move, so drown() allows crawling out of water */
            (void) drown();