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 049ef0fe081fcca852b2a220e988e0f04864aeb7..f0792286b032ce3f003749cdf5af5cc29ed26a34 100644 (file)
--- 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 82c0724b2e62b78232094acf68cd54647c0f03f9..9be3b9f22ead88fc6832d23fbe508b18de2e5d49 100644 (file)
--- 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.");