--- deliantra/server/socket/item.C	2008/04/24 00:30:52	1.63
+++ deliantra/server/socket/item.C	2008/09/08 11:27:25	1.71
@@ -39,146 +39,6 @@
 /** This is the maximum number of bytes we expect any one item to take up */
 #define MAXITEMLEN  300
 
-#if 0
-tag_t
-client_container::tag () const
-{
-  switch (type)
-    {
-      case CC_INVENTORY:
-        return ns->pl->count;
-      case CC_MAPSPACE:
-        return 0;
-      case CC_CONTAINER:
-        return env->count;
-    }
-
-  abort ();
-}
-
-void
-client_container::clear ()
-{
-  switch (type)
-    {
-      case CC_INVENTORY:
-        abort ();
-
-      case CC_MAPSPACE:
-      case CC_CONTAINER:
-        ns->send_packet_printf ("delinv %d", tag ());
-        break;
-    }
-
-  for (iterator i = begin (); i != end (); ++i)
-    i->op->seen_by = 0;
-
-  vector< refitem, slice_allocator<refitem> >::clear ();
-}
-
-inline iterator
-client_container::merge_item (iterator i, object *op)
-{
-  if (i != end () && i->op == op)
-    return ++i;
-
-  if (op->seen_by)
-    return; // seen by another entity already
-
-  op->seen_by = this;
-
-  refitem ref;
-  ref.op = op;
-
-  return insert (i, ref);
-}
-
-void
-client_container::update (int offset)
-{
-  iterator i = begin ();
-
-  switch (type)
-    {
-      case CC_INVENTORY:
-      case CC_CONTAINER:
-        {
-          object *env = type == CC_INVENTORY
-            ? ns->pl->ob
-            : this->env;
-
-          // pass 1, erase all objects no longer in container
-          for (iterator j = begin (); j != end (); ++j)
-            if (j->op->env != env)
-              {
-                j->op->seen_by = 0;
-                erase (j);
-              }
-
-          // pass 2 merge items
-          for (object *op = env->inv; op; op = op->below)
-            {
-              if (--offset < 0)
-                i = merge_item (i, op);
-              else if (offset < -FLOORBOX_PAGESIZE)
-                break;
-            }
-        }
-        break;
-
-      case CC_MAPSPACE:
-        {
-          // pass 1, erase all objects no longer on space
-          for (iterator j = begin (); j != end (); ++j)
-            if (j->op->x != x || j->op->y != y || j->op->map != map)
-              {
-                j->op->seen_by = 0;
-                erase (j);
-              }
-
-          // pass 2 merge items
-          for (object *op = GET_MAP_OB (map, x, y); op; op = op->above)
-            {
-              if (--offset < 0)
-                i = merge_item (i, op);
-              else if (offset < -FLOORBOX_PAGESIZE)
-                break;
-            }
-        }
-        break;
-    }
-
-  // pass 3, erase all extra items
-  for (iterator j = i; j != end (); ++j)
-    j->op->seen_by = 0;
-
-  if (i != end ())
-    erase (i, end ());
-}
-
-void
-client_container::set_mapspace (maptile *map, int x, int y)
-{
-  if (type == CC_MAPSPACE
-      && this->map == map
-      && this->x   == x
-      && this->y   == y)
-    return;
-
-  clear ();
-
-  type      = CC_MAPSPACE;
-  this->map = map;
-  this->x   = x;
-  this->y   = y;
-}
-
-void
-client_container::set_container (object *env)
-{
-}
-#endif
-
 /*******************************************************************************
  *
  * Functions related to sending object data to the client.
@@ -255,11 +115,10 @@
 static void
 add_object_to_socklist (client &ns, packet &sl, object *head)
 {
-  int flags, len, anim_speed;
   char item_n[MAX_BUF];
   const char *item_p;
 
-  flags = query_flags (head);
+  int flags = query_flags (head);
   if (QUERY_FLAG (head, FLAG_NO_PICK))
     flags |= F_NOPICK;
 
@@ -274,6 +133,8 @@
      << 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);
@@ -296,34 +157,31 @@
   sl << data8 (item_n, len)
      << uint16 (head->animation_id);
 
-  anim_speed = 0;
-  if (QUERY_FLAG (head, FLAG_ANIMATE))
-    {
-      if (head->anim_speed)
-        anim_speed = head->anim_speed;
-      else
-        {
-          if (fabs (head->speed) < 0.001)
-            anim_speed = 255;
-          else if (fabs (head->speed) >= 1.0)
-            anim_speed = 1;
-          else
-            anim_speed = (int) (1.0 / fabs (head->speed));
-        }
-
-      if (anim_speed > 255)
-        anim_speed = 255;
-    }
+  int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
+                 : head->anim_speed           ? clamp (head->anim_speed, 1, 255)
+                 :                              1. / clamp (fabs (head->speed), 1./255., 1./1.);
 
   sl << uint8  (anim_speed)
      << uint32 (head->nrof);
 
   if (ns.itemcmd == 2)
     sl << uint16 (head->client_type);
+}
+
+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 ();
 
-  SET_FLAG (head, FLAG_CLIENT_SENT);
+  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
@@ -332,8 +190,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)
@@ -357,82 +213,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)
     {
-      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;
-        }
-
-      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);
+      --item_cnt;
+      item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
+      object *item = items [item_idx];
 
-              if (pl->ns->itemcmd == 2)
-                sl << uint16 (0);
+      add_object_to_socklist (*pl->ns, sl, item->head_ ());
 
-              break;
-            }
+      dirty = true;
 
-          add_object_to_socklist (*pl->ns, sl, tmp->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);
 }
 
 /**
@@ -506,15 +385,6 @@
   if (!ns)
     return;
 
-  if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
-    {
-      /* FLAG_CLIENT_SENT is debug only.  We are using it to see where
-       * this is happening - we can set a breakpoint here in the debugger
-       * and track back the call.
-       */
-      LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
-    }
-
   packet sl ("upditem");
 
   sl << uint8 (flags);
@@ -632,7 +502,6 @@
   add_object_to_socklist (*pl->contr->ns, sl, op);
 
   pl->contr->ns->send_packet (sl);
-  SET_FLAG (op, FLAG_CLIENT_SENT);
 }
 
 /**
@@ -701,6 +570,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)
@@ -723,7 +600,8 @@
       std::string s = op->describe (pl->ob);
 
       packet sl ("ex");
-      sl << ber32 (tag) << s.c_str ();
+      sl << ber32 (tag)
+         << data (*pl->expand_cfpod (s.c_str ()));
 
       pl->ns->send_packet (sl);
     }
@@ -735,12 +613,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)
     {
@@ -824,16 +696,16 @@
           continue;
 
         if (QUERY_FLAG (ob, FLAG_WIZ))
-          buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
+          buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
         else
-          buf.printf ("- %s.\n", query_name (tmp));
+          buf.printf (" - %s.\n", query_name (tmp));
 
         object *head = tmp->head_ ();
 
         if (head->inv)
           if ((head->type != CONTAINER && head->type != FLESH)
               || QUERY_FLAG (ob, FLAG_WIZ))
-            buf << head->query_inventory (ob, "  ");
+            buf << head->query_inventory (ob, "   ");
 
         if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ))        /* don't continue under the floor */
           break;
@@ -874,9 +746,7 @@
 void
 esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
 {
-  object *op, *env;
-
-  op = esrv_get_ob_from_count (pl, tag);
+  object *op = esrv_get_ob_from_count (pl, tag);
   if (!op)
     {
       LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
@@ -895,14 +765,10 @@
         {
           int cnt = MAX_ITEM_PER_DROP;
 
-          for (object *current = op->inv; current; )
+          for (object *current = op->inv; current && cnt--; )
             {
               object *next = current->below;
-
               drop_object (pl, current, 0);
-
-              if (--cnt <= 0) break;
-
               current = next;
             }
 
@@ -925,7 +791,7 @@
       return;
     }
 
-  env = esrv_get_ob_from_count (pl, to);
+  object *env = esrv_get_ob_from_count (pl, to);
   if (!env)
     {
       LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);