--- deliantra/server/common/object.C	2006/09/11 20:28:37	1.30
+++ deliantra/server/common/object.C	2006/09/14 17:29:27	1.44
@@ -31,10 +31,11 @@
 #include <sys/uio.h>
 #include <object.h>
 #include <funcpoint.h>
-#include <skills.h>
 #include <loader.h>
 
 int nrofallocobjects = 0;
+static UUID uuid;
+const uint64 UUID_SKIP = 1<<19;
 
 object *objects;                /* Pointer to the list of used objects */
 object *active_objects;         /* List of active objects that need to be processed */
@@ -53,6 +54,83 @@
   1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
 };
 
+static void
+write_uuid (void)
+{
+  char filename1[MAX_BUF], filename2[MAX_BUF];
+
+  sprintf (filename1, "%s/uuid", settings.localdir);
+  sprintf (filename2, "%s/uuid~", settings.localdir);
+
+  FILE *fp;
+
+  if (!(fp = fopen (filename2, "w")))
+    {
+      LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
+      return;
+    }
+
+  fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
+  fclose (fp);
+  rename (filename2, filename1);
+}
+
+static void
+read_uuid (void)
+{
+  char filename[MAX_BUF];
+
+  sprintf (filename, "%s/uuid", settings.localdir);
+
+  FILE *fp;
+
+  if (!(fp = fopen (filename, "r")))
+    {
+      if (errno == ENOENT)
+        {
+          LOG (llevInfo, "RESET uid to 1\n");
+          uuid.seq = 0;
+          write_uuid ();
+          return;
+        }
+
+      LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
+      _exit (1);
+    }
+
+  int version;
+  unsigned long long uid;
+  if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
+    {
+      LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
+      _exit (1);
+    }
+
+  uuid.seq = uid;
+  write_uuid ();
+  LOG (llevDebug, "read UID: %lld\n", uid);
+  fclose (fp);
+}
+
+UUID
+gen_uuid ()
+{
+  UUID uid;
+
+  uid.seq = ++uuid.seq;
+
+  if (!(uuid.seq & (UUID_SKIP - 1)))
+    write_uuid ();
+
+  return uid;
+}
+
+void
+init_uuid ()
+{
+  read_uuid ();
+}
+
 /* Returns TRUE if every key_values in wants has a partner with the same value in has. */
 static int
 compare_ob_value_lists_one (const object *wants, const object *has)
@@ -257,10 +335,13 @@
         sum_weight (inv);
       sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
     }
+
   if (op->type == CONTAINER && op->stats.Str)
     sum = (sum * (100 - op->stats.Str)) / 100;
+
   if (op->carrying != sum)
     op->carrying = sum;
+
   return sum;
 }
 
@@ -419,11 +500,11 @@
 object *
 find_object_name (const char *str)
 {
-  const char *name = shstr::find (str);
+  shstr_cmp str_ (str);
   object *op;
 
   for (op = objects; op != NULL; op = op->next)
-    if (&op->name == name)
+    if (op->name == str_)
       break;
 
   return op;
@@ -436,27 +517,6 @@
 }
 
 /*
- * Returns the object which this object marks as being the owner.
- * A id-scheme is used to avoid pointing to objects which have been
- * freed and are now reused.  If this is detected, the owner is
- * set to NULL, and NULL is returned.
- * Changed 2004-02-12 - if the player is setting at the play again
- * prompt, he is removed, and we don't want to treat him as an owner of
- * anything, so check removed flag.  I don't expect that this should break
- * anything - once an object is removed, it is basically dead anyways.
- */
-object *
-object::get_owner ()
-{
-  if (!owner
-      || QUERY_FLAG (owner, FLAG_FREED)
-      || QUERY_FLAG (owner, FLAG_REMOVED))
-    owner = 0;
-
-  return owner;
-}
-
-/*
  * Sets the owner and sets the skill and exp pointers to owner's current
  * skill and experience objects.
  */
@@ -533,7 +593,6 @@
 
   expmul = 1.0;
   face = blank_face;
-  attacked_by_count = -1;
 
   if (settings.casting_time)
     casting_time = -1;
@@ -625,7 +684,6 @@
  * value, or vice versa, then add/remove the object from the active list.
  * This function needs to be called whenever the speed of an object changes.
  */
-
 void
 update_ob_speed (object *op)
 {
@@ -644,10 +702,10 @@
       op->speed = 0;
 #endif
     }
+
   if (arch_init)
-    {
-      return;
-    }
+    return;
+
   if (FABS (op->speed) > MIN_ACTIVE_SPEED)
     {
       /* If already on active list, don't do anything */
@@ -657,8 +715,10 @@
       /* process_events() expects us to insert the object at the beginning
        * of the list. */
       op->active_next = active_objects;
+
       if (op->active_next != NULL)
         op->active_next->active_prev = op;
+
       active_objects = op;
     }
   else
@@ -670,15 +730,18 @@
       if (op->active_prev == NULL)
         {
           active_objects = op->active_next;
+
           if (op->active_next != NULL)
             op->active_next->active_prev = NULL;
         }
       else
         {
           op->active_prev->active_next = op->active_next;
+
           if (op->active_next)
             op->active_next->active_prev = op->active_prev;
         }
+
       op->active_next = NULL;
       op->active_prev = NULL;
     }
@@ -835,7 +898,6 @@
 }
 
 static unordered_vector<object *> mortals;
-static std::vector<object *> freed;
 
 void object::free_mortals ()
 {
@@ -844,13 +906,17 @@
       ++i; // further delay freeing
     else
       {
-        freed.push_back (*i);//D
-        //delete *i;
+        delete *i;
         mortals.erase (i);
       }
 
-  if (mortals.size())//D
-  LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
+  static int lastmortals = 0;//D
+
+  if (mortals.size() != lastmortals)//D
+    {
+      lastmortals = mortals.size ();//D
+      LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
+    }
 }
 
 object::object ()
@@ -859,7 +925,6 @@
 
   expmul = 1.0;
   face = blank_face;
-  attacked_by_count = -1;
 }
 
 object::~object ()
@@ -870,6 +935,7 @@
 void object::link ()
 {
   count = ++ob_count;
+  uuid = gen_uuid ();
 
   prev = 0;
   next = objects;
@@ -882,41 +948,23 @@
 
 void object::unlink ()
 {
-  count = 0;
-
-  /* Remove this object from the list of used objects */
-  if (prev)
-    {
-      prev->next = next;
-      prev = 0;
-    }
-
-  if (next)
-    {
-      next->prev = prev;
-      next = 0;
-    }
+  //count = 0;//D
+  if (!prev && !next) return;//D
 
   if (this == objects)
     objects = next;
+
+  /* Remove this object from the list of used objects */
+  if (prev) prev->next = next;
+  if (next) next->prev = prev;
+
+  prev = 0;
+  next = 0;
 }
 
 object *object::create ()
 {
-  object *
-    op;
-
-  if (freed.empty ())
-    op = new object;
-  else
-    {
-      // highly annoying, but the only way to get it stable right now
-      op = freed.back ();
-      freed.pop_back ();
-      op->~object ();
-      new ((void *) op) object;
-    }
-
+  object *op = new object;
   op->link ();
   return op;
 }
@@ -936,12 +984,12 @@
   if (QUERY_FLAG (this, FLAG_FREED))
     return;
 
-  if (!QUERY_FLAG (this, FLAG_REMOVED))
-    remove_ob (this);
-
   if (QUERY_FLAG (this, FLAG_FRIENDLY))
     remove_friendly_object (this);
 
+  if (!QUERY_FLAG (this, FLAG_REMOVED))
+    remove_ob (this);
+
   SET_FLAG (this, FLAG_FREED);
 
   if (more)
@@ -956,7 +1004,7 @@
        * if some form of movement is allowed, let objects
        * drop on that space.
        */
-      if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))
+      if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
         {
           object *op = inv;
 
@@ -992,7 +1040,10 @@
         }
     }
 
-  owner = 0;
+  // clear those pointers that likely might have circular references to us
+  owner       = 0;
+  enemy       = 0;
+  attacked_by = 0;
 
   /* Remove object from the active list */
   speed = 0;
@@ -1222,7 +1273,6 @@
  * If top is NULL, it is calculated.
  * Returns pointer to object if it succeded in the merge, otherwise NULL
  */
-
 object *
 merge_ob (object *op, object *top)
 {
@@ -2653,7 +2703,8 @@
     {
       LOG (llevError, "Error - Unable to access load object temp file\n");
       return NULL;
-    };
+    }
+
   fprintf (tempfile, obstr);
   fclose (tempfile);
 
@@ -2720,34 +2771,27 @@
 const char *
 get_ob_key_value (const object *op, const char *const key)
 {
-  key_value *
-    link;
-  const char *
-    canonical_key;
-
-  canonical_key = shstr::find (key);
+  key_value *link;
+  shstr_cmp canonical_key (key);
 
-  if (canonical_key == NULL)
+  if (!canonical_key)
     {
       /* 1. There being a field named key on any object
        *    implies there'd be a shared string to find.
        * 2. Since there isn't, no object has this field.
        * 3. Therefore, *this* object doesn't have this field.
        */
-      return NULL;
+      return 0;
     }
 
   /* This is copied from get_ob_key_link() above -
    * only 4 lines, and saves the function call overhead.
    */
-  for (link = op->key_values; link != NULL; link = link->next)
-    {
-      if (link->key == canonical_key)
-        {
-          return link->value;
-        }
-    }
-  return NULL;
+  for (link = op->key_values; link; link = link->next)
+    if (link->key == canonical_key)
+      return link->value;
+
+  return 0;
 }
 
 
@@ -2842,3 +2886,54 @@
 
   return set_ob_key_value_s (op, key_, value, add_key);
 }
+
+object::depth_iterator::depth_iterator (object *container)
+: iterator_base (container)
+{
+  while (item->inv)
+    item = item->inv;
+}
+
+void
+object::depth_iterator::next ()
+{
+  if (item->below)
+    {
+      item = item->below;
+
+      while (item->inv)
+        item = item->inv;
+    }
+  else
+    item = item->env;
+}
+
+// return a suitable string describing an objetc in enough detail to find it
+const char *
+object::debug_desc (char *info) const
+{
+  char info2[256 * 3];
+  char *p = info;
+
+  p += snprintf (p, 256, "%d=\"%s%s%s\"",
+                 count,
+                 &name,
+                 title ? " " : "",
+                 title ? (const char *)title : "");
+
+  if (env)
+    p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
+
+  if (map)
+    p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
+
+  return info;
+}
+
+const char *
+object::debug_desc () const
+{
+  static char info[256 * 3];
+  return debug_desc (info);
+}
+