--- deliantra/server/common/object.C	2006/09/12 18:15:34	1.35
+++ deliantra/server/common/object.C	2006/09/13 02:05:19	1.39
@@ -34,6 +34,8 @@
 #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 */
@@ -52,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)
@@ -256,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;
 }
 
@@ -838,7 +920,7 @@
 }
 
 static unordered_vector<object *> mortals;
-static std::vector<object *> freed;
+static std::vector<object *, slice_allocator <object *> > freed;
 
 void object::free_mortals ()
 {
@@ -886,6 +968,10 @@
 void object::unlink ()
 {
   count = 0;
+  uuid = gen_uuid ();
+
+  if (this == objects)
+    objects = next;
 
   /* Remove this object from the list of used objects */
   if (prev)
@@ -899,9 +985,6 @@
       next->prev = prev;
       next = 0;
     }
-
-  if (this == objects)
-    objects = next;
 }
 
 object *object::create ()
@@ -1224,7 +1307,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)
 {
@@ -2859,3 +2941,32 @@
     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);
+}
+