--- deliantra/server/common/player.C	2007/09/04 05:43:21	1.34
+++ deliantra/server/common/player.C	2008/08/29 02:07:09	1.40
@@ -1,11 +1,11 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -18,11 +18,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 #include <global.h>
-#include <funcpoint.h>
 
 /* Determine if the attacktype represented by the
  * specified attack-number is enabled for dragon players.
@@ -82,7 +81,6 @@
   PL_OUT  (gen_hp);
   PL_OUT  (gen_sp);
   PL_OUT  (gen_grace);
-  PL_OUT  (listening);
   PL_OUT  (bowtype);
   PL_OUT  (petmode);
   PL_OUT  (peaceful);
@@ -193,7 +191,7 @@
           case KW_bowtype:       pl->bowtype   = (bowtype_t) f.get_sint32 (); break;
           case KW_petmode:       pl->petmode   = (petmode_t) f.get_sint32 (); break;
           case KW_gender:        f.get (pl->gender); break;
-          case KW_listening:     f.get (pl->listening); break;
+          case KW_listening:     /*TODO*/; break;
           case KW_peaceful:      f.get (pl->peaceful); break;
           case KW_digestion:     f.get (pl->digestion); break;
           case KW_pickup:        f.get (pl->mode); break;
@@ -268,3 +266,23 @@
   return 0;
 }
 
+const char *
+player::killer_name () const
+{
+  static char buf [2048];
+
+  if (!killer)
+    return "a dungeon collapse";
+  else if (killer->contr)
+    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->outer_owner ()->name, &killer->name);
+  else
+    return &killer->name;
+
+  return buf;
+}
+