--- deliantra/server/socket/item.C	2008/04/22 02:46:18	1.59
+++ deliantra/server/socket/item.C	2008/04/24 00:30:52	1.63
@@ -195,39 +195,37 @@
   unsigned int flags = 0;
 
   if (QUERY_FLAG (op, FLAG_APPLIED))
-    {
-      switch (op->type)
-        {
-          case BOW:
-          case WAND:
-          case ROD:
-          case HORN:
-            flags = a_readied;
-            break;
-          case WEAPON:
-            flags = a_wielded;
-            break;
-          case SKILL:
-          case ARMOUR:
-          case HELMET:
-          case SHIELD:
-          case RING:
-          case BOOTS:
-          case GLOVES:
-          case AMULET:
-          case GIRDLE:
-          case BRACERS:
-          case CLOAK:
-            flags = a_worn;
-            break;
-          case CONTAINER:
-            flags = a_active;
-            break;
-          default:
-            flags = a_applied;
-            break;
-        }
-    }
+    switch (op->type)
+      {
+        case BOW:
+        case WAND:
+        case ROD:
+        case HORN:
+          flags = a_readied;
+          break;
+        case WEAPON:
+          flags = a_wielded;
+          break;
+        case SKILL:
+        case ARMOUR:
+        case HELMET:
+        case SHIELD:
+        case RING:
+        case BOOTS:
+        case GLOVES:
+        case AMULET:
+        case GIRDLE:
+        case BRACERS:
+        case CLOAK:
+          flags = a_worn;
+          break;
+        case CONTAINER:
+          flags = a_active;
+          break;
+        default:
+          flags = a_applied;
+          break;
+      }
 
   if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
     flags |= F_OPEN;
@@ -273,7 +271,7 @@
 
   sl << uint32 (head->count)
      << uint32 (flags)
-     << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
+     << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
      << uint32 (head->face);
 
   if (!head->custom_name)
@@ -343,8 +341,8 @@
       LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
       return;
     }
-  else
-    pl->ns->update_look = 0;
+
+  pl->ns->update_look = 0;
 
   if (QUERY_FLAG (ob, FLAG_REMOVED)
       || !ob->map
@@ -383,8 +381,6 @@
   object *tmp = ob->ms ().top;
   for (object *last = 0; tmp != last; tmp = tmp->below)
     {
-      object *head;
-
       if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
         {
           last = tmp->below;    /* assumes double floor mode */
@@ -419,12 +415,7 @@
               break;
             }
 
-          if (tmp->head)
-            head = tmp->head;
-          else
-            head = tmp;
-
-          add_object_to_socklist (*pl->ns, sl, head);
+          add_object_to_socklist (*pl->ns, sl, tmp->head_ ());
           got_one++;
 
           if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
@@ -508,15 +499,8 @@
 esrv_update_item (int flags, object *pl, object *op)
 {
   /* If we have a request to send the player item, skip a few checks. */
-  if (op != pl)
-    {
-      if (!op->client_visible ())
-        return;
-      /* we remove the check for op->env, because in theory, the object
-       * is hopefully in the same place, so the client should preserve
-       * order.
-       */
-    }
+  if (op != pl && !op->client_visible ())
+    return;
 
   client *ns = pl->contr->ns;
   if (!ns)
@@ -535,8 +519,7 @@
 
   sl << uint8 (flags);
 
-  if (op->head)
-    op = op->head;
+  op = op->head_ ();
 
   sl << uint32 (op->count);
 
@@ -548,12 +531,12 @@
 
   if (flags & UPD_WEIGHT)
     {
-      sint32 weight = WEIGHT (op);
-
-      sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
+      sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
 
-      if (pl == op)
+      if (op)
         ns->last_weight = weight;
+
+      sl << uint32 (weight);
     }
 
   if (flags & UPD_FACE)
@@ -634,29 +617,15 @@
   if (!pl->contr->ns)
     return;
 
-  /* If this is not the player object, do some more checks */
-  if (op != pl)
-    {
-      /* We only send 'visibile' objects to the client */
-      if (!op->client_visible ())
-        return;
-
-      /* if the item is on the ground, mark that the look needs to
-       * be updated.
-       */
-      if (!op->env)
-        {
-          pl->contr->ns->floorbox_update ();
-          return;
-        }
-    }
+  /* We only send 'visible' objects to the client, and sometimes the player */
+  if (!op->client_visible () && op->type != PLAYER)
+    return;
 
   packet sl;
 
   sl.printf ("item%d ", pl->contr->ns->itemcmd);
 
-  if (op->head)
-    op = op->head;
+  op = op->head_ ();
 
   sl << uint32 (op->env ? op->env->count : 0);
 
@@ -924,28 +893,25 @@
        */
       if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
         {
-          object *current, *next;
-
           int cnt = MAX_ITEM_PER_DROP;
 
-          for (current = op->inv; current != NULL; current = next)
+          for (object *current = op->inv; current; )
             {
-              next = current->below;
+              object *next = current->below;
+
               drop_object (pl, current, 0);
 
               if (--cnt <= 0) break;
+
+              current = next;
             }
 
           if (cnt <= 0)
             op->failmsg ("Only dropped some items, can't drop that many items at once.");
-
-          esrv_update_item (UPD_WEIGHT, pl, op);
         }
       else
         drop_object (pl, op, nrof);
 
-      update_after_inventory_change (pl);
-
       return;
     }
   else if (to == pl->count)
@@ -971,10 +937,9 @@
    * in a sack, so check for those things.  We should also check
    * an make sure env is in fact a container for that matter.
    */
-  if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
-    {
-      put_object_in_sack (pl, env, op, nrof);
-      update_after_inventory_change (pl);
-    }
+  if (env->type == CONTAINER
+      && can_pick (pl, op)
+      && sack_can_hold (pl, env, op, nrof))
+    put_object_in_sack (pl, env, op, nrof);
 }