From c9f7360301f0aae2b5d4f1135ab25d22ae42f192 Mon Sep 17 00:00:00 2001 From: arromdee Date: Wed, 27 Feb 2002 02:29:33 +0000 Subject: [PATCH] stopping occupation when missed This fixes beta bug 3020. It was hard to notice because the presence of a monster in the room stops your occupation anyway, so it wasn't triggered unless you were blind. --- doc/fixes34.0 | 1 + src/mhitu.c | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/fixes34.0 b/doc/fixes34.0 index 374ab284c..6f8ca3d40 100644 --- a/doc/fixes34.0 +++ b/doc/fixes34.0 @@ -446,6 +446,7 @@ slip while mounting and levitating at will should not cause damage if you see a monster jump into a trap in a secret corridor, it's not secret fixed a few places where unblock_point wasn't called but should have been cloned monsters should have the same name and tameness as the original +you should stop eating (etc.) if a monster attacks you and misses Platform- and/or Interface-Specific Fixes diff --git a/src/mhitu.c b/src/mhitu.c index 77b76a705..db03bbc91 100644 --- a/src/mhitu.c +++ b/src/mhitu.c @@ -99,6 +99,7 @@ register struct attack *mattk; else pline("%s just misses!", Monnam(mtmp)); } + stop_occupation(); } STATIC_OVL void @@ -1536,12 +1537,12 @@ do_stone: mdamageu(mtmp, dmg); } - if (dmg) { + if (dmg) res = passiveum(olduasmon, mtmp, mattk); - stop_occupation(); - return res; - } else - return 1; + else + res = 1; + stop_occupation(); + return res; } #endif /* OVL1 */ -- 2.50.1