--- deliantra/server/common/player.C	2010/03/24 16:44:38	1.64
+++ deliantra/server/common/player.C	2012/01/03 11:25:31	1.70
@@ -1,9 +1,9 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010 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,2012 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
@@ -105,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. */
@@ -174,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;
@@ -238,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;