--- deliantra/server/socket/item.C	2009/10/12 14:00:59	1.79
+++ deliantra/server/socket/item.C	2009/10/19 21:48:49	1.80
@@ -88,7 +88,7 @@
           break;
       }
 
-  if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
+  if (op->is_open_container ())
     flags |= F_OPEN;
 
   if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
@@ -535,7 +535,7 @@
   for (object *op = pl->inv; op; op = op->below)
     if (op->count == count)
       return op;
-    else if (op->type == CONTAINER && pl->container == op)
+    else if (op->type == CONTAINER && pl->container_ () == op)
       for (object *tmp = op->inv; tmp; tmp = tmp->below)
         if (tmp->count == count)
           return tmp;
@@ -545,7 +545,7 @@
       return op;
     else if (op->count == count)
       return op;
-    else if (op->type == CONTAINER && pl->container == op)
+    else if (op->type == CONTAINER && pl->container_ () == op)
       for (object *tmp = op->inv; tmp; tmp = tmp->below)
         if (tmp->count == count)
           return tmp;