--- deliantra/server/include/map.h	2008/04/15 14:21:04	1.91
+++ deliantra/server/include/map.h	2008/07/14 16:42:49	1.96
@@ -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
  * 
@@ -157,6 +157,11 @@
   {
     return move_block && (mt & move_block) == mt;
   }
+
+  bool blocks (object *op) const
+  {
+    return blocks (op->move_type);
+  }
 };
 
 struct shopitems : zero_initialised
@@ -218,7 +223,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 +269,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,7 +333,7 @@
   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]; }
@@ -422,9 +428,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);
   }
 };