From 31c4ccd43bebe9f4e18f7199d2041dfee8cd8875 Mon Sep 17 00:00:00 2001 From: cohrs Date: Mon, 1 Apr 2002 05:33:32 +0000 Subject: [PATCH] R363 - can't drown breathless monsters - if you're polymorphed into an eel, you were able to drown things like xorns - also, fix the tombstone message when an eel drowns you, it was basing the message on your location, not the eel's location --- doc/fixes34.1 | 1 + src/mhitu.c | 5 +++-- src/uhitm.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/fixes34.1 b/doc/fixes34.1 index dc1836f12..37e7b3841 100644 --- a/doc/fixes34.1 +++ b/doc/fixes34.1 @@ -45,6 +45,7 @@ touch_artifact checks needed when snagging w/bullwhip and stealing cannot trip over submerged objects if you're water walking wand of striking was not identified if it activated a statue trap cannot sacrifice while you're swallowed +player polymorphed into an eel cannot drown breathless/amphibious monsters Platform- and/or Interface-Specific Fixes diff --git a/src/mhitu.c b/src/mhitu.c index 3f9dc3508..8ac2262fa 100644 --- a/src/mhitu.c +++ b/src/mhitu.c @@ -1158,8 +1158,9 @@ do_stone: } else if(u.ustuck == mtmp) { if (is_pool(mtmp->mx,mtmp->my) && !Swimming && !Amphibious) { - boolean moat = (levl[u.ux][u.uy].typ != POOL) && - (levl[u.ux][u.uy].typ != WATER) && + boolean moat = + (levl[mtmp->mx][mtmp->my].typ != POOL) && + (levl[mtmp->mx][mtmp->my].typ != WATER) && !Is_medusa_level(&u.uz) && !Is_waterlevel(&u.uz); diff --git a/src/uhitm.c b/src/uhitm.c index 4c322a0c5..929bb9f25 100644 --- a/src/uhitm.c +++ b/src/uhitm.c @@ -1417,7 +1417,8 @@ register struct attack *mattk; } } else if(u.ustuck == mdef) { /* Monsters don't wear amulets of magical breathing */ - if (is_pool(u.ux,u.uy) && !is_swimmer(mdef->data)) { + if (is_pool(u.ux,u.uy) && !is_swimmer(mdef->data) && + !amphibious(mdef->data)) { You("drown %s...", mon_nam(mdef)); tmp = mdef->mhp; } else if(mattk->aatyp == AT_HUGS)