From b7641eb0ed9de0fb3e0fcdfb3d4c9e9c3cc909d4 Mon Sep 17 00:00:00 2001 From: Erik Lunna Date: Fri, 6 Dec 2024 14:08:36 +0100 Subject: [PATCH] Fix: fire bolt vs straw/paper golems. There was an extra xkill where the fire bolt hit monsters that would burn up completely, causing a m_detach error. --- src/zap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/zap.c b/src/zap.c index 7494d6add..46f011f40 100644 --- a/src/zap.c +++ b/src/zap.c @@ -229,8 +229,7 @@ bhitm(struct monst *mtmp, struct obj *otmp) (mtmp->data == &mons[PM_PAPER_GOLEM]) ? " paper" : (mtmp->data == &mons[PM_STRAW_GOLEM]) ? " straw" : ""); xkilled(mtmp, XKILL_NOMSG | XKILL_NOCORPSE); - if (DEADMONSTER(mtmp)) - killed(mtmp); + dmg = 0; } else if (!resist(mtmp, otmp->oclass, dmg, NOTELL) && !DEADMONSTER(mtmp)) { dmg = d(1, 10); /* Level 1 = 1d10 fire damage */