--- deliantra/server/include/player.h	2010/04/10 04:54:09	1.105
+++ deliantra/server/include/player.h	2012/11/14 06:18:13	1.112
@@ -1,24 +1,24 @@
 /*
  * 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 (©) 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
  * 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
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
- * 
+ *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
@@ -133,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
@@ -159,7 +159,7 @@
 
   float speed_left_save;                  // spee doptimisation, see process_players[12]
   char write_buf[MAX_BUF];                /* Holds arbitrary input from client */ /* should go */
-  char ACC (RW, password)[16];            /* 2 (seed) + 11 (crypted) + 1 (EOS) + 2 (safety) = 16 */
+  char ACC (RW, password)[256];           /* 2 (seed) + 11 (crypted) + 1 (EOS) + 2 (safety) = 16 */
 
   partylist *ACC (RW, party);             /* Party this player is part of */
   partylist *ACC (RW, party_to_join);     /* used when player wants to join a party */
@@ -246,6 +246,7 @@
   void gather_callbacks (AV *&callbacks, event_type event) const;
 
   MTH dynbuf_text *expand_cfpod (const_utf8_string cfpod) const;
+  static dynbuf_text *expand_cfpod (int hintmode, int gender, const_utf8_string cfpod);
 
   MTH void touch () { dirty = true; } // need to touch when logged out and changed
 
@@ -289,7 +290,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);
-  MTH void failmsgf (const_utf8_string format, ...); // always NDI_RED
+  void failmsgf (const_utf8_string format, ...); // always NDI_RED
 
   MTH void update_spells () const
   {