--- deliantra/server/include/object.h	2007/09/10 12:44:06	1.149
+++ deliantra/server/include/object.h	2007/09/30 20:22:19	1.151
@@ -299,6 +299,8 @@
       do_remove ();
   }
 
+  MTH bool blocked (maptile *m, int x, int y) const;
+
   void move_to (const mapxy &pos)
   {
     remove ();
@@ -507,6 +509,8 @@
   void statusmsg (const char *msg, int color = NDI_BLACK);
   void failmsg (const char *msg, int color = NDI_RED);
 
+  const char *query_inventory (object *who = 0, const char *indent = "");
+
   MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference
   static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible
 
@@ -637,9 +641,6 @@
  *     beneath the player, but not actually above it.  Note - the
  *     map and x,y coordinates for the object to be inserted must
  *     match the originator.
- * INS_MAP_LOAD: disable lots of checkings done at insertion to
- *     speed up map loading process, as we assume the ordering in
- *     loaded map is correct.
  *
  * Note that INS_BELOW_ORIGINATOR, INS_ON_TOP, INS_ABOVE_FLOOR_ONLY
  * are mutually exclusive.  The behaviour for passing more than one
@@ -652,7 +653,6 @@
 #define INS_NO_WALK_ON          0x0004
 #define INS_ON_TOP              0x0008
 #define INS_BELOW_ORIGINATOR    0x0010
-#define INS_MAP_LOAD            0x0020
 
 #define ARCH_DEPLETION          "depletion"