--- deliantra/server/include/map.h	2008/04/15 14:21:04	1.91
+++ deliantra/server/include/map.h	2008/12/23 00:39:48	1.100
@@ -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-2005,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
@@ -65,7 +65,6 @@
  */
 // all those macros are herewith declared legacy
 #define GET_MAP_FLAGS(M,X,Y)         (M)->at((X),(Y)).flags ()
-#define GET_MAP_LIGHT(M,X,Y)         (M)->at((X),(Y)).light
 #define GET_MAP_OB(M,X,Y)            (M)->at((X),(Y)).bot
 #define GET_MAP_TOP(M,X,Y)           (M)->at((X),(Y)).top
 #define GET_MAP_FACE_OBJ(M,X,Y,L)    (M)->at((X),(Y)).faces_obj[L]
@@ -112,51 +111,62 @@
  * This puts it all in one place, and should also make it easier
  * to extend information about a space.
  */
+INTERFACE_CLASS (mapspace)
 struct mapspace
 {
-  object *bot, *top;            /* lowest/highest object on this space */
-  object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */
+  object *ACC (RW, bot);
+  object *ACC (RW, top);        /* lowest/highest object on this space */
+  object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */
   uint8 flags_;                 /* flags about this space (see the P_ values above) */
-  sint8 light;                  /* How much light this space provides */
-  MoveType move_block;          /* What movement types this space blocks */
-  MoveType move_slow;           /* What movement types this space slows */
-  MoveType move_on;             /* What movement types are activated */
-  MoveType move_off;            /* What movement types are activated */
+  sint8 ACC (RW, light);                  /* How much light this space provides */
+  MoveType ACC (RW, move_block);          /* What movement types this space blocks */
+  MoveType ACC (RW, move_slow);           /* What movement types this space slows */
+  MoveType ACC (RW, move_on);             /* What movement types are activated */
+  MoveType ACC (RW, move_off);            /* What movement types are activated */
 
   void update_ ();
-  void update ()
+  MTH void update ()
   {
     if (!(flags_ & P_UPTODATE))
       update_ ();
   }
 
-  uint8 flags ()
+  MTH uint8 flags ()
   {
     update ();
     return flags_;
   }
+
+  MTH void invalidate ()
+  {
+    flags_ = 0;
+  }
   
-  // maybe only inline quick flags_ checking?
-  object *player ()
+  MTH object *player ()
   {
-    // search from the top, because players are usually on top
-    // make usually == always and this non-amortized O(1)
-    // could gte rid of P_PLAYER, too, then
+    object *op;
+
     if (flags () & P_PLAYER)
-      for (object *op = top; op; op = op->below)
-        if (op->type == PLAYER)
-          return op;
+      for (op = top; op->type != PLAYER; op = op->below)
+        ;
+    else
+      op = 0;
 
-    return 0;
+    return op;
   }
 
   // return the item volume on this mapspace in cm³
-  uint64 volume () const;
+  MTH uint64 volume () const;
 
   bool blocks (MoveType mt) const
   {
     return move_block && (mt & move_block) == mt;
   }
+
+  bool blocks (object *op) const
+  {
+    return blocks (op->move_type);
+  }
 };
 
 struct shopitems : zero_initialised
@@ -218,7 +228,7 @@
   bool ACC (RW, per_player);
   bool ACC (RW, per_party);
   bool ACC (RW, outdoor);  /* True if an outdoor map */
-  bool ACC (RW, nodrop);   /* avoid dropping anything on this map */
+  bool ACC (RW, no_drop);   /* avoid auto-dropping (on death) anything on this map */
   uint8 ACC (RW, darkness);        /* indicates level of darkness of map */
 
   uint16 ACC (RW, enter_x);        /* enter_x and enter_y are default entrance location */
@@ -264,6 +274,7 @@
 
   // set the given flag on all objects in the map
   MTH void set_object_flag (int flag, int value = 1);
+  MTH void post_load_original ();
 
   MTH void link_multipart_objects ();
   MTH void clear_unique_items ();
@@ -327,10 +338,9 @@
   static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//PERL
   static maptile *find_sync (const char *path, maptile *original = 0);//PERL
   static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
-  MTH object *pick_random_object () const;
+  object *pick_random_object (rand_gen &gen = rndm) const;
 
-  mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
-  mapspace       &at (uint32 x, uint32 y)       { return spaces [x * height + y]; }
+  mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
 };
 
 /* This is used by get_rangevector to determine where the other
@@ -422,9 +432,14 @@
     return xy_normalise (m, x, y);
   }
 
+  mapspace &ms () const
+  {
+    return m->at (x, y);
+  }
+
   object *insert (object *op, object *originator = 0, int flags = 0) const
   {
-    m->insert (op, x, y, originator, flags);
+    return m->insert (op, x, y, originator, flags);
   }
 };