--- deliantra/server/include/object.h	2007/08/16 06:36:56	1.143
+++ deliantra/server/include/object.h	2007/09/10 12:44:06	1.149
@@ -133,6 +133,7 @@
   shstr ACC (RW, race);		/* human, goblin, dragon, etc */
   shstr ACC (RW, slaying);	/* Which race to do double damage to */
 				/* If this is an exit, this is the filename */
+  shstr ACC (RW, tag);          // a tag used to tracking this object
   shstr ACC (RW, skill);	/* Name of the skill this object uses/grants */
   shstr ACC (RW, msg);		/* If this is a book/sign/magic mouth/etc */
   shstr ACC (RW, lore);		/* Obscure information about this object, */
@@ -272,12 +273,13 @@
   key_value *key_values;	/* Fields not explictly known by the loader. */
 
   bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all
-  void post_load_check ();          // do some adjustments after parsing
+  MTH void post_load_check ();          // do some adjustments after parsing
   static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go.
   bool write (object_freezer &f);
 
   MTH int slottype () const;
   MTH static object *create ();
+  const mapxy &operator =(const mapxy &pos);
   object &operator =(const object &src);
   MTH void copy_to (object *dst);
   MTH object *clone (); // create + copy_to
@@ -297,6 +299,13 @@
       do_remove ();
   }
 
+  void move_to (const mapxy &pos)
+  {
+    remove ();
+    *this = pos;
+    insert_at (this, this);
+  }
+
   static bool can_merge_slow (object *op1, object *op2);
 
   // this is often used in time-critical code, so optimise
@@ -385,7 +394,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_MAP_SAVE]; }
+  MTH bool can_map_save () const { return !head && (!owner || owner->contr) && !contr && !flag [FLAG_NO_MAP_SAVE]; }
 
   /* This return true if object has still randomitems which
    * could be expanded.
@@ -496,7 +505,10 @@
   MTH struct region *region () const;
 
   void statusmsg (const char *msg, int color = NDI_BLACK);
-  void errormsg (const char *msg, int color = NDI_RED);
+  void failmsg (const char *msg, int color = NDI_RED);
+
+  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
 
 protected:
   void link   ();
@@ -559,16 +571,16 @@
   void gather_callbacks (AV *&callbacks, event_type event) const;
 
   static archetype *read (object_thawer &f);
-  static archetype *get  (const char *name); // find or create
-  static archetype *find (const char *name);
 
-  void link   ();
-  void unlink ();
+  MTH static archetype *get  (const_utf8_string name); // find or create
+  MTH static archetype *find (const_utf8_string name);
+
+  MTH void link   ();
+  MTH void unlink ();
 
   object_vector_index ACC (RW, archid);         // index in archvector
   shstr ACC (RW, archname);		   	/* More definite name, like "generate_kobold" */
   bool ACC (RW, stub);                          // if true, this is an invalid archetype
-  uint32 ACC (RW, editable);	       		/* editable flags (mainly for editor) */
 
   sint8 ACC (RW, min_x), ACC (RW, min_y);       /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */
   sint8 ACC (RW, max_x), ACC (RW, max_y);