--- deliantra/server/common/player.C	2008/04/30 06:40:28	1.37
+++ deliantra/server/common/player.C	2008/06/20 21:17:19	1.39
@@ -275,11 +275,12 @@
   if (!killer)
     return "a dungeon collapse";
   else if (killer->contr)
-    snprintf (buf, sizeof (buf), "%s the %s", &killer->name, &killer->title);
+    snprintf (buf, sizeof (buf), "%s the %s", &killer->name,
+              *killer->contr->own_title ? killer->contr->own_title : killer->contr->title);
   else if (killer->type == DEEP_SWAMP)
     snprintf (buf, sizeof (buf), "drowning in a %s", &killer->name);
   else if (killer->owner)
-    snprintf (buf, sizeof (buf), "%s's %s", &killer->owner->name, &killer->name);
+    snprintf (buf, sizeof (buf), "%s's %s", &killer->outer_owner ()->name, &killer->name);
   else
     return &killer->name;