--- deliantra/server/common/player.C	2007/05/18 19:46:22	1.28
+++ deliantra/server/common/player.C	2008/06/20 21:17:19	1.39
@@ -1,29 +1,27 @@
 /*
- * CrossFire, A Multiplayer game
- *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
- *
- * This program is free software; you can redistribute it and/or modify
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ * 
+ * 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
+ * 
+ * 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 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * 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.
@@ -50,8 +48,8 @@
   if (op
       && op->type == PLAYER
       && op->arch
-      && op->arch->clone.race
-      && !strcmp (op->arch->clone.race, "dragon"))
+      && op->arch->race
+      && !strcmp (op->arch->race, "dragon"))
     return 1;
 
   return 0;
@@ -79,6 +77,7 @@
 
   PL_OUT  (password);
   PL_OUT2 (title, own_title);
+  PL_OUT  (gender);
   PL_OUT  (gen_hp);
   PL_OUT  (gen_sp);
   PL_OUT  (gen_grace);
@@ -112,9 +111,9 @@
 
   for (int i = 1; i <= 10; i++)
     {
-      fprintf (freezer, "%d\n", levhp   [i]);
-      fprintf (freezer, "%d\n", levsp   [i]);
-      fprintf (freezer, "%d\n", levgrace[i]);
+      freezer.add (levhp   [i]); freezer.add ('\n');
+      freezer.add (levsp   [i]); freezer.add ('\n');
+      freezer.add (levgrace[i]); freezer.add ('\n');
     }
 
   freezer.put (ob->contr);
@@ -192,6 +191,7 @@
           case KW_title:         assign (pl->own_title, f.get_str ()); break;
           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_peaceful:      f.get (pl->peaceful); break;
           case KW_digestion:     f.get (pl->digestion); break;
@@ -267,16 +267,23 @@
   return 0;
 }
 
-player *
-player::load_pl (const char *path)
+const char *
+player::killer_name () const
 {
-  object_thawer f (path);
-
-  if (!f)
-    return 0;
+  static char buf [2048];
 
-  f.next ();
+  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 load_pl (f);
+  return buf;
 }