--- deliantra/server/common/player.C	2007/11/08 19:43:23	1.35
+++ deliantra/server/common/player.C	2008/04/30 06:40:28	1.37
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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
  * 
@@ -22,7 +22,6 @@
  */
 
 #include <global.h>
-#include <funcpoint.h>
 
 /* Determine if the attacktype represented by the
  * specified attack-number is enabled for dragon players.
@@ -268,3 +267,22 @@
   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->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);
+  else
+    return &killer->name;
+
+  return buf;
+}
+