--- deliantra/server/include/object.h	2008/05/03 11:14:50	1.172
+++ deliantra/server/include/object.h	2008/05/05 15:54:39	1.176
@@ -340,7 +340,8 @@
   MTH static object *create ();
   const mapxy &operator =(const mapxy &pos);
   MTH void copy_to (object *dst);
-  MTH object *clone (); // create + copy_to
+  MTH object *clone (); // create + copy_to a single object
+  MTH object *deep_clone (); // copy whole more chain and inventory
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
   MTH void destroy (bool destroy_inventory = false);
@@ -538,6 +539,7 @@
 
   void enter_exit (object *exit);//Perl
   MTH void enter_map (maptile *newmap, int x, int y);
+  void player_goto (const char *path, int x, int y); // only for players
 
   // returns the mapspace this object is in
   mapspace &ms () const;
@@ -678,7 +680,7 @@
   MTH void link   ();
   MTH void unlink ();
 
-  MTH static object *get (const char *name); // find()->instance()
+  MTH static object *get (const char *name); // (find() || singularity)->instance()
   MTH object *instance ();
 
   object_vector_index ACC (RW, archid);         // index in archvector
@@ -707,15 +709,20 @@
 extern activevec actives;
 extern archvec   archetypes;
 
-#define for_all_objects(var)                    \
+// "safely" iterate over inv in a way such that the current item is removable
+// quite horrible, thats why its hidden in some macro
+#define for_inv_removable(op,var)			\
+  for (object *var, *next_ = (op)->inv; (var = next_), var && (next_ = var->below), var; )
+
+#define for_all_objects(var)                    	\
   for (unsigned _i = 0; _i < objects.size (); ++_i)     \
     statementvar (object *, var, objects [_i])
 
-#define for_all_actives(var)                    \
+#define for_all_actives(var)                    	\
   for (unsigned _i = 0; _i < actives.size (); ++_i)     \
     statementvar (object *, var, actives [_i])
 
-#define for_all_archetypes(var)                 \
+#define for_all_archetypes(var)                 	\
   for (unsigned _i = 0; _i < archetypes.size (); ++_i)  \
     statementvar (archetype *, var, archetypes [_i])