--- deliantra/server/socket/item.C	2008/04/22 07:01:47	1.60
+++ deliantra/server/socket/item.C	2008/05/05 22:03:22	1.64
@@ -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;
@@ -326,6 +324,20 @@
   SET_FLAG (head, FLAG_CLIENT_SENT);
 }
 
+static faceidx
+need_face_now (player *pl, const char *name)
+{
+  faceidx face = face_find (name, empty_face);
+
+  pl->ns->send_face (face, -50);
+  pl->ns->flush_fx ();
+
+  return face;
+}
+
+#define FINGER_UP   "finger_up.x11"
+#define FINGER_DOWN "finger_down.x11"
+
 /**
  * Send the look window. Don't need to do animations here 
  * This sends all the faces to the client, not just updates. This is
@@ -334,8 +346,6 @@
 void
 esrv_draw_look (player *pl)
 {
-  int got_one = 0, start_look = 0, end_look = 0;
-
   object *ob = pl->ob;
 
   if (!pl->ns->update_look)
@@ -343,8 +353,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
@@ -359,89 +369,105 @@
 
   sl << uint32 (0);
 
-  pl->ns->send_face (empty_face, -50);
-  pl->ns->flush_fx ();
+  int start_pos = pl->ns->look_position;
+  bool dirty = false;
+
+  mapspace &ms = ob->ms ();
+
+  // manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
+  // start from the top
+  object *items [FLOORBOX_PAGESIZE];
+  int item_idx = 0, item_cnt = 0;
+  int pos = 0;
+
+  // find our items by walking down
+  object *item = ms.top;
 
-  if (pl->ns->look_position)
+  for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
     {
-      char buf[80];
-      snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
+      if (!item->client_visible ())
+        continue;
 
-      sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
+      if (++pos < start_pos)
+        continue;
+
+      // record item
+      items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
+      item_cnt++;
+
+      // stop at first floor
+      if (item->flag [FLAG_IS_FLOOR])
+        {
+          // we are finished, don't append "next group of items"
+          // by setting item to ms.bot it becomes zero which is checked after the while loop
+          item = ms.bot;
+        }
+    }
+
+  // see if there are more if we cared - we ignore invisible objects
+  if (item)
+    {
+      /* What we basically do is make a 'fake' object - when the user applies it,
+       * we notice the special tag the object has, and act accordingly.
+       */
+      sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
          << uint32 (0)
-         << sint32 (-1)
-         << uint32 (empty_face)
-         << data8 (buf)
+         << uint32 ((uint32) - 1)
+         << uint32 (need_face_now (pl, FINGER_DOWN))
+         << data8  ("Apply this to see the items below")
          << uint16 (0)
          << uint8  (0)
          << uint32 (0);
 
       if (pl->ns->itemcmd == 2)
         sl << uint16 (0);
+
+      dirty = true;
     }
 
-  object *tmp = ob->ms ().top;
-  for (object *last = 0; tmp != last; tmp = tmp->below)
+  // now send out all items in the ring buffer in reverse order
+  while (item_cnt)
     {
-      object *head;
+      --item_cnt;
+      item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
+      object *item = items [item_idx];
 
-      if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
-        {
-          last = tmp->below;    /* assumes double floor mode */
-          if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
-            last = last->below;
-        }
+      add_object_to_socklist (*pl->ns, sl, item->head_ ());
 
-      if (tmp->client_visible ())
-        {
-          if (++start_look < pl->ns->look_position)
-            continue;
-
-          end_look++;
-
-          if (end_look > FLOORBOX_PAGESIZE)
-            {
-              /* What we basically do is make a 'fake' object - when the user applies it,
-               * we notice the special tag the object has, and act accordingly.
-               */
-              sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
-                 << uint32 (0)
-                 << uint32 ((uint32) - 1)
-                 << uint32 (empty_face)
-                 << data8  ("Apply this to see next group of items")
-                 << uint16 (0)
-                 << uint8  (0)
-                 << uint32 (0);
-
-              if (pl->ns->itemcmd == 2)
-                sl << uint16 (0);
-
-              break;
-            }
-
-          if (tmp->head)
-            head = tmp->head;
-          else
-            head = tmp;
+      dirty = true;
 
-          add_object_to_socklist (*pl->ns, sl, head);
-          got_one++;
+      // if packet got too large, send it and begin a new one
+      if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
+        {
+          pl->ns->send_packet (sl);
 
-          if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
-            {
-              pl->ns->send_packet (sl);
+          sl.reset ();
+          sl.printf ("item%d ", pl->ns->itemcmd);
+          sl << uint32 (0);
 
-              sl.reset ();
-              sl.printf ("item%d ", pl->ns->itemcmd);
-              sl << uint32 (0);
-              got_one = 0;
-            }
+          dirty = false;
         }
     }
   
-  if (got_one)
-    pl->ns->send_packet (sl);
+  if (start_pos)
+    {
+      sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE))
+         << uint32 (0)
+         << sint32 (-1)
+         << uint32 (need_face_now (pl, FINGER_UP))
+         << data8  ("Apply this to see the items higher up")
+         << uint16 (0)
+         << uint8  (0)
+         << uint32 (0);
 
+      if (pl->ns->itemcmd == 2)
+        sl << uint16 (0);
+
+      dirty = true;
+    }
+
+  if (dirty)
+    pl->ns->send_packet (sl);
 }
 
 /**
@@ -508,15 +534,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 +554,7 @@
 
   sl << uint8 (flags);
 
-  if (op->head)
-    op = op->head;
+  op = op->head_ ();
 
   sl << uint32 (op->count);
 
@@ -548,14 +566,12 @@
 
   if (flags & UPD_WEIGHT)
     {
-      sint32 weight = op->client_weight ();
-
-      sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
+      sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
 
-#if 0
-      if (pl == op)
+      if (op)
         ns->last_weight = weight;
-#endif
+
+      sl << uint32 (weight);
     }
 
   if (flags & UPD_FACE)
@@ -636,29 +652,15 @@
   if (!pl->contr->ns)
     return;
 
-  /* If this is not the player object, do some more checks */
-  if (op != pl)
-    {
-      /* We only send 'visible' 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);
 
@@ -734,6 +736,14 @@
 {
   tag_t tag = atoi (buf);
 
+  /* If the high bit is set, player applied a pseudo object. */
+  if (tag & 0x80000000)
+    {
+      pl->ns->look_position = tag & 0x7fffffff;
+      pl->ns->floorbox_update ();
+      return;
+    }
+
   object *op = esrv_get_ob_from_count (pl->ob, tag);
 
   if (!op)
@@ -768,12 +778,6 @@
 {
   tag_t tag = atoi (buf);
 
-  /* sort of a hack, but if the player saves and the player then manually
-   * applies a savebed (or otherwise tries to do stuff), we run into trouble.
-   */
-  if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
-    return;
-
   /* If the high bit is set, player applied a pseudo object. */
   if (tag & 0x80000000)
     {
@@ -945,8 +949,6 @@
       else
         drop_object (pl, op, nrof);
 
-      update_after_inventory_change (pl);
-
       return;
     }
   else if (to == pl->count)
@@ -972,10 +974,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);
 }