--- deliantra/server/include/player.h	2008/05/04 14:12:37	1.78
+++ deliantra/server/include/player.h	2008/09/25 04:09:57	1.83
@@ -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
  * 
@@ -111,8 +111,8 @@
   int ACC (RW, gen_sp_armour);      /* Penalty to sp regen from armour */
   int ACC (RW, gen_grace);          /* Bonuses to regeneration speed of grace */
   int ACC (RW, item_power);        /* Total item power of objects equipped */
-  uint8 ACC (RW, listening);          /* Which priority will be used in info_all */
-  uint8 ACC (RW, gender);             /* 0 male, 1 female, others not yte defined */
+  uint8 ACC (RW, gender);             /* 0 male, 1 female, others not yet defined */
+  uint8 ACC (RW, hintmode);           /* 0 full, 1 hint, 2 disable */
 
   /* Try to put all the bitfields together - saves some small amount of memory */
   bool ACC (RW, braced);              /* Will not move if braced, only attack */
@@ -180,12 +180,16 @@
   static player *load_pl (object_thawer &thawer);
   MTH static player *load_pl (object_thawer *thawer) { return load_pl (*thawer); }
 
+  MTH void link_skills ();
+
   bool save_pl (object_freezer &freezer);
   MTH bool save_pl (const char *path);
 
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
 
+  MTH dynbuf_text *expand_cfpod (const char *cfpod) const;
+
   MTH void touch () { dirty = true; } // need to touch when logged out and changed
 
   MTH void play_sound (faceidx sound, int dx = 0, int dy = 0) const
@@ -207,7 +211,7 @@
   MTH void chargen_race_done ();
   MTH void chargen_race_next ();
 
-  MTH void set_observe (object *ob);
+  MTH void set_observe (object_ornull *ob);
 
   void send_msg (int color, const char *type, const char *msg)
   {