--- deliantra/server/include/player.h	2008/04/23 07:25:54	1.76
+++ deliantra/server/include/player.h	2009/01/01 19:42:43	1.90
@@ -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 */
@@ -148,7 +148,7 @@
   sint8 ACC (RW, levsp[11]);              /* Same for sp */
   sint8 ACC (RW, levgrace[11]);           /* And same for grace */
 
-  char ACC (RW, killer)[64];        /* Who killed this player. */
+  object_ptr ACC (RW, killer);            /* Who last tried to kill this player (this object is usually destroyed) */
 
   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 */
@@ -166,24 +166,53 @@
   /* Special DM fields */
   tag_t *stack_items;           /* Item stack for patch/dump/... commands */
   int ACC (RW, stack_position);           /* Current stack position, 0 for no item */
-  sint8 blocked_los[MAP_CLIENT_X][MAP_CLIENT_Y];        /* array showing what spaces */
-                                                        /* the player can see.  For maps smaller than */
-                                                        /* MAP_CLIENT_.., the upper left is used */
+  sint8 los[MAP_CLIENT_X][MAP_CLIENT_Y];        /* array showing what spaces */
+                                                /* the player can see.  For maps smaller than */
+                                                /* MAP_CLIENT_.., the center is used */
+
+  // return the los value for the given coordinate
+  MTH sint8 blocked_los (int dx, int dy) const
+  {
+    dx += LOS_X0;
+    dy += LOS_Y0;
+
+    return 0 <= dx && dx < MAP_CLIENT_X
+        && 0 <= dy && dy < MAP_CLIENT_Y
+           ? los[dx][dy] : LOS_BLOCKED;
+  }
+
+  // unchecked variant
+  sint8 blocked_los_uc (int dx, int dy) const
+  {
+    return los[dx + LOS_X0][dy + LOS_Y0];
+  }
+
+  MTH void clear_los (sint8 value = LOS_BLOCKED);
+  MTH void update_los ();
 
   shstr ACC (RW, invis_race);             /* What race invisible to? */
 
+  MTH const char *killer_name () const; // makes a string out of ->killer
+
   MTH static player *create ();
   static player *find (const_utf8_string name);
 
   static player *load_pl (object_thawer &thawer);
   MTH static player *load_pl (object_thawer *thawer) { return load_pl (*thawer); }
 
+  MTH void link_skills ();
+  MTH object *find_skill (shstr_cmp name) const;
+
   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
   {
     if (ns)
@@ -191,8 +220,8 @@
   }
 
   // wether the player can "see" this mapspace or not, decided by los
-  // 0 - nothing see, 100 - fully visible
-  MTH sint8 visibility_at (maptile *map, int x, int y) const;
+  // 0 - bright, 3 dark, 4 too dark, 100 blocked or out of range
+  MTH sint8 darkness_at (maptile *map, int x, int y) const;
 
   MTH void connect (client *ns);
   MTH void disconnect ();
@@ -203,7 +232,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)
   {
@@ -239,6 +268,10 @@
   for (unsigned _i = 0; _i < ::players.size (); ++_i)	\
     statementvar (player *, var, ::players [_i])
 
+#define for_all_players_on_map(var,mapp)		\
+  for_all_players(var)					\
+    if ((var)->ob->map == (mapp))
+
 inline void
 object::statusmsg (const char *msg, int color)
 {