--- deliantra/server/include/object.h	2007/01/23 03:17:55	1.92
+++ deliantra/server/include/object.h	2007/02/05 01:24:45	1.95
@@ -250,11 +250,11 @@
   // recursively destroy all objects in inventory, optionally dropping them to the ground instead
   MTH void destroy_inv (bool drop_to_ground = false);
   MTH object *insert (object *item); // insert into inventory
-  void remove_slow ();
+  void do_remove ();
   MTH void remove ()
   {
     if (!flag [FLAG_REMOVED])
-      remove_slow ();
+      do_remove ();
   }
 
   static bool can_merge_slow (object *op1, object *op2);
@@ -401,6 +401,8 @@
     return !invisible && type != PLAYER;
   }
 
+  MTH struct region *region () const;
+
 protected:
   friend struct archetype;
 
@@ -454,7 +456,7 @@
   ~archetype ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
 
-  static archetype *find (const char *arch);
+  static archetype *find (const char *name);
 
   void hash_add (); // add to hashtable
   void hash_del (); // remove from hashtable