From 25e5208deb1f7eac79fcc5ba1c72133bc5878715 Mon Sep 17 00:00:00 2001 From: cohrs Date: Thu, 16 May 2002 03:13:34 +0000 Subject: [PATCH] R868 - don't kill paper/straw golems twice longtime bug in damageum, if hero is poly'd to something with fire damage, and hits a paper or straw golem, mondead will get called twice for the monster. Fix this, by working like AD_CURS does no clay golem. Also, make sure no scrolls, et al, get dropped by disallowing a corpse. --- doc/fixes34.1 | 2 ++ src/uhitm.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/fixes34.1 b/doc/fixes34.1 index cf27d2da9..5cdcf2e58 100644 --- a/doc/fixes34.1 +++ b/doc/fixes34.1 @@ -105,6 +105,8 @@ clear worn bits of any object grabbed by shopkeeper to avoid extract_nobj panic looting any container on a location should suppress looting nearby monsters give more specific message when forbidden role attempts to use twoweapon mode avoid double billing if #loot causes a shop's bag of holding to explode +when polymorphed, player killing a paper or straw golem via fire damage + would kill the golem twice, resulting in an impossible error Platform- and/or Interface-Specific Fixes diff --git a/src/uhitm.c b/src/uhitm.c index 6799ecb5d..025805ac4 100644 --- a/src/uhitm.c +++ b/src/uhitm.c @@ -1188,7 +1188,10 @@ register struct attack *mattk; pd == &mons[PM_PAPER_GOLEM]) { if (!Blind) pline("%s burns completely!", Monnam(mdef)); - xkilled(mdef,0); + xkilled(mdef,2); + tmp = 0; + break; + /* Don't return yet; keep hp<1 and tmp=0 for pet msg */ } tmp += destroy_mitem(mdef, SCROLL_CLASS, AD_FIRE); tmp += destroy_mitem(mdef, SPBOOK_CLASS, AD_FIRE); -- 2.40.0