--- deliantra/server/common/object.C	2007/01/26 20:59:56	1.123
+++ deliantra/server/common/object.C	2007/02/10 21:01:09	1.132
@@ -821,7 +821,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 ();
@@ -905,7 +913,7 @@
  *   the previous environment.
  */
 void
-object::remove_slow ()
+object::do_remove ()
 {
   object *tmp, *last = 0;
   object *otmp;
@@ -958,6 +966,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 ();
         }
@@ -1969,7 +1983,7 @@
   if (!index)
     return -1;
 
-  return altern[RANDOM () % index];
+  return altern [rndm (index)];
 }
 
 /*
@@ -2000,7 +2014,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! 
@@ -2572,7 +2586,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:\"" : "",
@@ -2602,3 +2616,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);
+    }
+}
+
+