--- deliantra/server/include/object.h	2007/01/14 22:06:05	1.87
+++ deliantra/server/include/object.h	2007/01/27 23:59:29	1.93
@@ -122,7 +122,7 @@
   arch_ptr ACC (RW, arch);	/* Pointer to archetype */
   arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
 
-  New_Face *ACC (RW, face);	/* Face with colors */
+  facetile *ACC (RW, face);	/* Face with colors */
   float ACC (RW, speed);	/* The overall speed of this object */
   float ACC (RW, speed_left);	/* How much speed is left to spend this round */
   uint32 ACC (RW, nrof);	/* How many of the objects */
@@ -249,8 +249,13 @@
 
   // recursively destroy all objects in inventory, optionally dropping them to the ground instead
   MTH void destroy_inv (bool drop_to_ground = false);
-  MTH void remove ();
   MTH object *insert (object *item); // insert into inventory
+  void remove_slow ();
+  MTH void remove ()
+  {
+    if (!flag [FLAG_REMOVED])
+      remove_slow ();
+  }
 
   static bool can_merge_slow (object *op1, object *op2);
 
@@ -307,7 +312,7 @@
   // contr => is a player
   // head  => only save head of a multitile object
   // owner => can not reference owner yet
-  MTH bool can_map_save () const { return !contr && !head && !owner && !flag [FLAG_NO_SAVE]; }
+  MTH bool can_map_save () const { return !contr && !head && !owner && !flag [FLAG_NO_MAP_SAVE]; }
 
   /* This return true if object has still randomitems which
    * could be expanded.
@@ -396,6 +401,8 @@
     return !invisible && type != PLAYER;
   }
 
+  MTH struct region *region () const;
+
 protected:
   friend struct archetype;