--- deliantra/server/common/object.C	2007/01/21 21:28:27	1.120
+++ deliantra/server/common/object.C	2007/03/11 02:12:44	1.135
@@ -359,7 +359,6 @@
  *      Some error messages.
  * The result of the dump is stored in the static global errmsg array.
  */
-
 char *
 dump_object (object *op)
 {
@@ -367,7 +366,7 @@
     return strdup ("[NULLOBJ]");
 
   object_freezer freezer;
-  save_object (freezer, op, 1);
+  op->write (freezer);
   return freezer.as_string ();
 }
 
@@ -526,6 +525,24 @@
   dst->set_speed (dst->speed);
 }
 
+void
+object::instantiate ()
+{
+  if (!uuid.seq) // HACK
+    uuid = gen_uuid ();
+
+  speed_left = -0.1f;
+  /* copy the body_info to the body_used - this is only really
+   * need for monsters, but doesn't hurt to do it for everything.
+   * by doing so, when a monster is created, it has good starting
+   * values for the body_used info, so when items are created 
+   * for it, they can be properly equipped.
+   */
+  memcpy (body_used, body_info, sizeof (body_used));
+
+  attachable::instantiate ();
+}
+
 object *
 object::clone ()
 {
@@ -591,8 +608,6 @@
 void
 update_object (object *op, int action)
 {
-  MoveType move_on, move_off, move_block, move_slow;
-
   if (op == NULL)
     {
       /* this should never happen */
@@ -672,8 +687,7 @@
 
 object::~object ()
 {
-  if (index)
-    unlink ();
+  unlink ();
 
   free_key_values (this);
 }
@@ -692,7 +706,9 @@
 
 void object::unlink ()
 {
-  assert (index);//D
+  if (!index)
+    return;
+
   objects.erase (this);
   refcnt_dec ();
 }
@@ -776,6 +792,7 @@
   if (!drop_to_ground
       || !map
       || map->in_memory != MAP_IN_MEMORY
+      || map->nodrop
       || ms ().move_block == MOVE_ALL)
     {
       while (inv)
@@ -819,7 +836,15 @@
     remove_button_link (this);
 
   if (flag [FLAG_FRIENDLY])
-    remove_friendly_object (this);
+    {
+      remove_friendly_object (this);
+
+      if (type == GOLEM
+          && owner
+          && owner->type == PLAYER
+          && owner->contr->ranges[range_golem] == this)
+        owner->contr->ranges[range_golem] = 0;
+    }
 
   if (!flag [FLAG_REMOVED])
     remove ();
@@ -901,10 +926,9 @@
  *   object will have no environment.  If the object previously had an
  *   environment, the x and y coordinates will be updated to
  *   the previous environment.
- *   Beware: This function is called from the editor as well!
  */
 void
-object::remove_slow ()
+object::do_remove ()
 {
   object *tmp, *last = 0;
   object *otmp;
@@ -957,6 +981,12 @@
     {
       if (type == PLAYER)
         {
+          // leaving a spot always closes any open container on the ground
+          if (container && !container->env)
+            // this causes spurious floorbox updates, but it ensures
+            // that the CLOSE event is being sent.
+            close_container ();
+
           --map->players;
           map->touch ();
         }
@@ -1261,14 +1291,14 @@
            */
 
           /* Have object 'fall below' other objects that block view.
-           * Unless those objects are exits, type 66
+           * Unless those objects are exits.
            * If INS_ON_TOP is used, don't do this processing
            * Need to find the object that in fact blocks view, otherwise
            * stacking is a bit odd.
            */
           if (!(flag & INS_ON_TOP)
               && ms.flags () & P_BLOCKSVIEW
-              && (op->face && !op->face->visibility))
+              && (op->face && !faces [op->face].visibility))
             {
               for (last = top; last != floor; last = last->below)
                 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
@@ -1401,6 +1431,7 @@
   insert_ob_in_map (tmp1, op->map, op, 0);
 }
 
+// XXX: function not returning object*
 object *
 object::insert_at (object *where, object *originator, int flags)
 {
@@ -1968,7 +1999,7 @@
   if (!index)
     return -1;
 
-  return altern[RANDOM () % index];
+  return altern [rndm (index)];
 }
 
 /*
@@ -1999,7 +2030,7 @@
   end -= begin;
 
   while (--end)
-    swap (arr [end], arr [RANDOM () % (end + 1)]);
+    swap (arr [end], arr [rndm (end + 1)]);
 }
 
 /* new function to make monster searching more efficient, and effective! 
@@ -2321,44 +2352,6 @@
   return dst;
 }
 
-/* GROS - Creates an object using a string representing its content.         */
-/* Basically, we save the content of the string to a temp file, then call    */
-/* load_object on it. I admit it is a highly inefficient way to make things, */
-/* but it was simple to make and allows reusing the load_object function.    */
-/* Remember not to use load_object_str in a time-critical situation.         */
-/* Also remember that multiparts objects are not supported for now.          */
-object *
-load_object_str (const char *obstr)
-{
-  object *op;
-  char filename[MAX_BUF];
-
-  sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
-
-  FILE *tempfile = fopen (filename, "w");
-
-  if (tempfile == NULL)
-    {
-      LOG (llevError, "Error - Unable to access load object temp file\n");
-      return NULL;
-    }
-
-  fprintf (tempfile, obstr);
-  fclose (tempfile);
-
-  op = object::create ();
-
-  object_thawer thawer (filename);
-
-  if (thawer)
-    load_object (thawer, op, 0);
-
-  LOG (llevDebug, " load str completed, object=%s\n", &op->name);
-  CLEAR_FLAG (op, FLAG_REMOVED);
-
-  return op;
-}
-
 /* This returns the first object in who's inventory that
  * has the same type and subtype match.
  * returns NULL if no match.
@@ -2571,7 +2564,7 @@
   char info2[256 * 4];
   char *p = info;
 
-  p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
+  p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
                  count, uuid.seq,
                  &name,
                  title ? "\",title:\"" : "",
@@ -2601,3 +2594,74 @@
   return debug_desc (info);
 }
 
+struct region *
+object::region () const
+{
+  return map ? map->region (x, y)
+             : region::default_region ();
+}
+
+const materialtype_t *
+object::dominant_material () const
+{
+  if (materialtype_t *mat = name_to_material (materialname))
+    return mat;
+
+  // omfg this is slow, this has to be temporary :)
+  shstr unknown ("unknown");
+
+  return name_to_material (unknown);
+}
+
+void
+object::open_container (object *new_container)
+{
+  if (container == new_container)
+    return;
+
+  if (object *old_container = container)
+    {
+      if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
+        return;
+
+#if 0
+      // remove the "Close old_container" object.
+      if (object *closer = old_container->inv)
+        if (closer->type == CLOSE_CON)
+          closer->destroy ();
+#endif
+
+      old_container->flag [FLAG_APPLIED] = 0;
+      container = 0;
+
+      esrv_update_item (UPD_FLAGS, this, old_container);
+      new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
+    }
+
+  if (new_container)
+    {
+      if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
+        return;
+
+      // TODO: this does not seem to serve any purpose anymore?
+#if 0
+      // insert the "Close Container" object.
+      if (archetype *closer = new_container->other_arch)
+        {
+          object *closer = arch_to_object (new_container->other_arch);
+          closer->flag [FLAG_NO_MAP_SAVE] = 1;
+          new_container->insert (closer);
+        }
+#endif
+
+      new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
+
+      new_container->flag [FLAG_APPLIED] = 1;
+      container = new_container;
+
+      esrv_update_item (UPD_FLAGS, this, new_container);
+      esrv_send_inventory (this, new_container);
+    }
+}
+
+