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
@@ -195,7 +195,7 @@ wildmiss(struct monst *mtmp, struct attack *mattk)
                break;
            case 2:
                pline("%s strikes at %s!", Monst_name,
-                      (levl[mtmp->mux][mtmp->muy].typ == WATER)
+                      is_waterwall(mtmp->mux,mtmp->muy)
                        ? "empty water"
                        : "thin air");
                break;
@@ -1402,8 +1402,8 @@ explmu(struct monst *mtmp, struct attack *mattk, boolean ufound)
    if (!ufound) {
        pline("%s explodes at a spot in %s!",
              canseemon(mtmp) ? Monnam(mtmp) : "It",
-              levl[mtmp->mux][mtmp->muy].typ == WATER ? "empty water"
-                                                      : "thin air");
+              is_waterwall(mtmp->mux,mtmp->muy) ? "empty water"
+                                                : "thin air");
    } else {
        hitmsg(mtmp, mattk);
    }