--- deliantra/server/common/player.C	2009/11/11 23:27:56	1.60
+++ deliantra/server/common/player.C	2011/04/23 04:56:46	1.69
@@ -1,9 +1,9 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
  * 
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
@@ -42,22 +42,6 @@
 }
 
 /*
- * returns true if the adressed object 'ob' is a player
- * of the dragon race.
- */
-int
-is_dragon_pl (const object *op)
-{
-  if (op
-      && op->type == PLAYER
-      && op->arch
-      && op->arch->race == shstr_dragon)
-    return 1;
-
-  return 0;
-}
-
-/*
  * If final is set, it a clean/final save, not a backup, ie dont remove objects from inventory
  */
 bool
@@ -101,13 +85,13 @@
   PL_OUT  (bed_y);
   PL_OUT  (weapon_sp);
   PL_OUT  (weapon_sp_left);
-  PL_OUT2 (Str, orig_stats.Str);
-  PL_OUT2 (Dex, orig_stats.Dex);
-  PL_OUT2 (Con, orig_stats.Con);
-  PL_OUT2 (Int, orig_stats.Int);
-  PL_OUT2 (Pow, orig_stats.Pow);
-  PL_OUT2 (Wis, orig_stats.Wis);
-  PL_OUT2 (Cha, orig_stats.Cha);
+  PL_OUT2 (str, orig_stats.Str);
+  PL_OUT2 (dex, orig_stats.Dex);
+  PL_OUT2 (con, orig_stats.Con);
+  PL_OUT2 (int, orig_stats.Int);
+  PL_OUT2 (pow, orig_stats.Pow);
+  PL_OUT2 (wis, orig_stats.Wis);
+  PL_OUT2 (cha, orig_stats.Cha);
 
   PL_OUT2 (lev_array, 10);
 
@@ -121,7 +105,7 @@
   freezer.put (ob->contr);
   freezer.put (KW(endplst));
 
-  CLEAR_FLAG (ob, FLAG_WIZ);
+  ob->clr_flag (FLAG_WIZ);
   ob->write (freezer);
 
   /* Eneq(@csd.uu.se): Reveal the container if we have one. */
@@ -190,8 +174,8 @@
           case KW_oid:           f.get (pl, f.get_sint32 ()); break;
           case KW_password:      assign (pl->password , f.get_str ()); break;
           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_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_hintmode:      f.get (pl->hintmode); break;
           case KW_listening:     /*TODO*/; break;
@@ -206,13 +190,22 @@
           case KW_bed_y:         f.get (pl->bed_y); break;
           case KW_weapon_sp:     f.get (pl->weapon_sp); break;
           case KW_weapon_sp_left:f.get (pl->weapon_sp_left); break;
-          case KW_Str:           f.get (pl->orig_stats.Str); break;
-          case KW_Dex:           f.get (pl->orig_stats.Dex); break;
-          case KW_Con:           f.get (pl->orig_stats.Con); break;
-          case KW_Int:           f.get (pl->orig_stats.Int); break;
-          case KW_Pow:           f.get (pl->orig_stats.Pow); break;
-          case KW_Wis:           f.get (pl->orig_stats.Wis); break;
-          case KW_Cha:           f.get (pl->orig_stats.Cha); break;
+
+          case KW_Str:           // uppercase alias
+          case KW_str:           f.get (pl->orig_stats.Str); break;
+          case KW_Dex:           // uppercase alias
+          case KW_dex:           f.get (pl->orig_stats.Dex); break;
+          case KW_Con:           // uppercase alias
+          case KW_con:           f.get (pl->orig_stats.Con); break;
+          case KW_Int:           // uppercase alias
+          case KW_int:           f.get (pl->orig_stats.Int); break;
+          case KW_Pow:           // uppercase alias
+          case KW_pow:           f.get (pl->orig_stats.Pow); break;
+          case KW_Wis:           // uppercase alias
+          case KW_wis:           f.get (pl->orig_stats.Wis); break;
+          case KW_Cha:           // uppercase alias
+          case KW_cha:           f.get (pl->orig_stats.Cha); break;
+
           case KW_gen_hp:        f.get (pl->gen_hp); break;
           case KW_gen_sp:        f.get (pl->gen_sp); break;
           case KW_gen_grace:     f.get (pl->gen_grace); break;
@@ -245,11 +238,9 @@
 
               for (int i = 1; i <= count; i++)
                 {
-                  char line [32];
-
-                  fgets (line, 32, f); pl->levhp   [i] = atoi (line);
-                  fgets (line, 32, f); pl->levsp   [i] = atoi (line);
-                  fgets (line, 32, f); pl->levgrace[i] = atoi (line);
+                  f.next_line (); f.get (pl->levhp   [i]);
+                  f.next_line (); f.get (pl->levsp   [i]);
+                  f.next_line (); f.get (pl->levgrace[i]);
                 }
             }
             break;
@@ -269,7 +260,7 @@
   return 0;
 }
 
-const char *
+const_utf8_string
 player::killer_name () const
 {
   static char buf [2048];