From: cohrs <cohrs>
Date: Sun, 11 May 2003 04:18:25 +0000 (+0000)
Subject: B02003 - choking on unique monster corpse
X-Git-Tag: MOVE2GIT~2001
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8e61b8c478f69b263c0359a21c1a924ab1f9845;p=nethack

B02003 - choking on unique monster corpse
Try harder to use the pronoun "the" when refering to a unique monster's corpse
---

diff --git a/doc/fixes34.2 b/doc/fixes34.2
index 049ef0fe0..f0792286b 100644
--- a/doc/fixes34.2
+++ b/doc/fixes34.2
@@ -57,6 +57,7 @@ make sure that leashed monsters are released prior to shopkeeper inheriting
 attaching long named candle to long named candelabrum caused buffer overflow
 when polymorhed, only hand/weapon attack on disenchanter should result in
 	damage to weapon, gloves, etc.
+killer should say "the" when choking on unique monster's corpse
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/eat.c b/src/eat.c
index 82c0724b2..9be3b9f22 100644
--- a/src/eat.c
+++ b/src/eat.c
@@ -258,6 +258,11 @@ choke(food)	/* To a full belly all food is bad. (It.) */
 				killer = "a very rich meal";
 			} else {
 				killer = food_xname(food, FALSE);
+				if (food->otyp == CORPSE &&
+				    (mons[food->corpsenm].geno & G_UNIQ)) {
+				    killer = the(killer);
+				    killer_format = KILLED_BY;
+				}
 			}
 		} else {
 			You("choke over it.");