--- deliantra/server/include/player.h	2010/01/16 13:41:37	1.101
+++ deliantra/server/include/player.h	2010/04/16 02:38:04	1.107
@@ -2,8 +2,8 @@
  * 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 (©) 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
@@ -21,6 +21,7 @@
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
+
 #ifndef PLAYER_H_
 #define PLAYER_H_
 
@@ -132,7 +133,7 @@
   float ACC (RW, weapon_sp);              /* Penalties to speed when fighting w speed >ws/10 */
   float ACC (RW, weapon_sp_left);         // same as speed_left, but for attacks
   living ACC (RO, orig_stats);            /* Permanent real stats of player */
-  object_ptr last_skill_ob[NUM_SKILLS];   /* the exp object */
+  object_ptr last_skill_ob[CS_NUM_SKILLS];   /* the exp object */
   object_ptr ACC (RW, last_used);            /* Pointer to object last picked or applied */
 
   object_ptr ACC (RW, combat_ob);     // which weapon/bow/skill to use for direct attacks
@@ -191,6 +192,20 @@
       ob->update_stats ();
   }
 
+#if 0
+  enum {
+    SA_SPELLS = 1<<0,
+    SA_EXP    = 1<<1,
+  };
+
+  uint8 ACxC (RW, stat_update_flags);
+
+  void need_stat_update (int flags)
+  {
+    stat_update_flags |= flags;
+  }
+#endif
+
   // return the los value for the given coordinate
   MTH sint8 blocked_los (int dx, int dy) const
   {
@@ -225,7 +240,7 @@
   MTH object *find_skill (shstr_cmp name) const;
 
   bool save_pl (object_freezer &freezer);
-  MTH bool save_pl (const_utf8_string path);
+  MTH bool save_pl (const_octet_string path);
 
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
@@ -274,6 +289,7 @@
   // a prominent box that signifies some error such as a failed
   // improvement potion. should not be long.
   MTH void failmsg (const_utf8_string msg, int color = NDI_RED);
+  void failmsgf (const_utf8_string format, ...); // always NDI_RED
 
   MTH void update_spells () const
   {