--- deliantra/server/socket/item.C	2009/10/12 14:00:59	1.79
+++ deliantra/server/socket/item.C	2009/11/06 13:07:28	1.82
@@ -50,7 +50,7 @@
  *  This is a similar to query_name, but returns flags
  *  to be sent to client. 
  */
-unsigned int
+static unsigned int
 query_flags (object *op)
 {
   unsigned int flags = 0;
@@ -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))
@@ -116,10 +116,8 @@
 static void
 add_object_to_socklist (client &ns, packet &sl, object *head)
 {
-  char item_n[MAX_BUF];
-  const char *item_p;
-
   int flags = query_flags (head);
+
   if (QUERY_FLAG (head, FLAG_NO_PICK))
     flags |= F_NOPICK;
 
@@ -134,29 +132,28 @@
      << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
      << uint32 (head->face);
 
-  int len;
-
   if (!head->custom_name)
     {
-      strncpy (item_n, query_base_name (head, 0), 127);
-      item_n[127] = 0;
-      len = strlen (item_n);
-      item_p = query_base_name (head, 1);
+      const char *name;
+      uint8 *len = sl.cur++; // patch up length later
+
+      name = query_base_name (head, 0); sl << data (name, min (127, strlen (name)));
+      sl << uint8 (0);
+      name = query_base_name (head, 1); sl << data (name, min (127, strlen (name)));
+
+      *len = sl.cur - len - 1;
     }
   else
     {
-      strncpy (item_n, head->custom_name, 127);
-      item_n[127] = 0;
-      len = strlen (item_n);
-      item_p = head->custom_name;
-    }
+      int len = min (head->custom_name.length (), 127);
 
-  strncpy (item_n + len + 1, item_p, 127);
-  item_n[254] = 0;
-  len += strlen (item_n + 1 + len) + 1;
+      sl << uint8 (len * 2 + 1)
+         << data (head->custom_name, len)
+         << uint8 (0)
+         << data (head->custom_name, len);
+    }
 
-  sl << data8 (item_n, len)
-     << uint16 (head->animation_id);
+  sl << uint16 (head->animation_id);
 
   int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
                  : head->anim_speed           ? clamp (head->anim_speed, 1, 255)
@@ -526,7 +523,7 @@
  * Takes a player and object count (tag) and returns the actual object
  * pointer, or null if it can't be found.
  */
-object *
+static object *
 esrv_get_ob_from_count (object *pl, tag_t count)
 {
   if (pl->count == count)
@@ -535,7 +532,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 +542,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;