--- deliantra/server/socket/item.C	2006/12/16 22:14:42	1.24
+++ deliantra/server/socket/item.C	2006/12/21 23:37:06	1.29
@@ -39,6 +39,146 @@
 /** 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.
@@ -199,13 +339,13 @@
   int got_one = 0, start_look = 0, end_look = 0;
   char buf[MAX_BUF];
 
-  if (!pl->contr->socket->update_look)
+  if (!pl->contr->ns->update_look)
     {
       LOG (llevDebug, "esrv_draw_look called when update_look was not set\n");
       return;
     }
   else
-    pl->contr->socket->update_look = 0;
+    pl->contr->ns->update_look = 0;
 
   if (QUERY_FLAG (pl, FLAG_REMOVED)
       || !pl->map
@@ -213,26 +353,25 @@
       || out_of_map (pl->map, pl->x, pl->y))
     return;
 
-  for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)
+  for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)
     ;
 
-  packet sl;
-
-  pl->contr->socket->send_packet ("delinv 0");
+  pl->contr->ns->send_packet ("delinv 0");
 
-  sl.printf ("item%d ", pl->contr->socket->itemcmd);
+  packet sl;
+  sl.printf ("item%d ", pl->contr->ns->itemcmd);
 
   sl << uint32 (0);
 
-  if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE))
-    esrv_send_face (pl->contr->socket, empty_face->number, 0);
+  if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE))
+    esrv_send_face (pl->contr->ns, empty_face->number, 0);
 
-  if (pl->contr->socket->look_position)
+  if (pl->contr->ns->look_position)
     {
       char buf[80];
-      snprintf (buf, 80, "Apply this to see %d previous items", NUM_LOOK_OBJECTS);
+      snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
 
-      sl << uint32 (0x80000000 | (pl->contr->socket->look_position - NUM_LOOK_OBJECTS))
+      sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
          << uint32 (0)
          << sint32 (-1)
          << uint32 (empty_face->number)
@@ -241,7 +380,7 @@
          << uint8  (0)
          << uint32 (0);
 
-      if (pl->contr->socket->itemcmd == 2)
+      if (pl->contr->ns->itemcmd == 2)
         sl << uint16 (0);
     }
 
@@ -258,17 +397,17 @@
 
       if (LOOK_OBJ (tmp))
         {
-          if (++start_look < pl->contr->socket->look_position)
+          if (++start_look < pl->contr->ns->look_position)
             continue;
 
           end_look++;
 
-          if (end_look > NUM_LOOK_OBJECTS)
+          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->contr->socket->look_position + NUM_LOOK_OBJECTS))
+              sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
                  << uint32 (0)
                  << uint32 ((uint32) - 1)
                  << uint32 (empty_face->number)
@@ -277,7 +416,7 @@
                  << uint8  (0)
                  << uint32 (0);
 
-              if (pl->contr->socket->itemcmd == 2)
+              if (pl->contr->ns->itemcmd == 2)
                 sl << uint16 (0);
 
               break;
@@ -288,15 +427,15 @@
           else
             head = tmp;
 
-          add_object_to_socklist (*pl->contr->socket, sl, head);
+          add_object_to_socklist (*pl->contr->ns, sl, head);
           got_one++;
 
           if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
             {
-              pl->contr->socket->send_packet (sl);
+              pl->contr->ns->send_packet (sl);
 
               sl.reset ();
-              sl.printf ("item%d ", pl->contr->socket->itemcmd);
+              sl.printf ("item%d ", pl->contr->ns->itemcmd);
               sl << uint32 (0);
               got_one = 0;
             }
@@ -304,7 +443,7 @@
     }
   
   if (got_one)
-    pl->contr->socket->send_packet (sl);
+    pl->contr->ns->send_packet (sl);
 
 }
 
@@ -317,13 +456,11 @@
   object *tmp;
   int got_one = 0;
 
-  packet sl;
 
-  sl.printf ("delinv %d", op->count);
-  pl->contr->socket->send_packet (sl);
+  pl->contr->ns->send_packet_printf ("delinv %d", op->count);
 
-  sl.reset ();
-  sl.printf ("item%d ", pl->contr->socket->itemcmd);
+  packet sl;
+  sl.printf ("item%d ", pl->contr->ns->itemcmd);
 
   sl << uint32 (op->count);
 
@@ -338,7 +475,7 @@
 
       if (LOOK_OBJ (head))
         {
-          add_object_to_socklist (*pl->contr->socket, sl, head);
+          add_object_to_socklist (*pl->contr->ns, sl, head);
 
           got_one++;
 
@@ -348,10 +485,10 @@
            */
           if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
             {
-              pl->contr->socket->send_packet (sl);
+              pl->contr->ns->send_packet (sl);
 
               sl.reset ();
-              sl.printf ("item%d ", pl->contr->socket->itemcmd);
+              sl.printf ("item%d ", pl->contr->ns->itemcmd);
               sl << uint32 (op->count);
               got_one = 0;
             }
@@ -359,7 +496,7 @@
     }
 
   if (got_one)
-    pl->contr->socket->send_packet (sl);
+    pl->contr->ns->send_packet (sl);
 }
 
 /**
@@ -393,10 +530,9 @@
       LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
     }
 
-  packet sl;
+  packet sl ("upditem");
 
-  sl << "upditem "
-     << uint8 (flags);
+  sl << uint8 (flags);
 
   if (op->head)
     op = op->head;
@@ -421,8 +557,8 @@
 
   if (flags & UPD_FACE)
     {
-      if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE))
-        esrv_send_face (pl->contr->socket, op->face->number, 0);
+      if (!(pl->contr->ns->faces_sent[op->face->number] & NS_FACESENT_FACE))
+        esrv_send_face (pl->contr->ns, op->face->number, 0);
 
       sl << uint32 (op->face->number);
     }
@@ -486,7 +622,7 @@
   if (flags & UPD_NROF)
     sl << uint32 (op->nrof);
 
-  pl->contr->socket->send_packet (sl);
+  pl->contr->ns->send_packet (sl);
 }
 
 /**
@@ -506,23 +642,23 @@
        */
       if (!op->env)
         {
-          pl->contr->socket->update_look = 1;
+          pl->contr->ns->floorbox_update ();
           return;
         }
     }
 
   packet sl;
 
-  sl.printf ("item%d ", pl->contr->socket->itemcmd);
+  sl.printf ("item%d ", pl->contr->ns->itemcmd);
 
   if (op->head)
     op = op->head;
 
   sl << uint32 (op->env ? op->env->count : 0);
 
-  add_object_to_socklist (*pl->contr->socket, sl, op);
+  add_object_to_socklist (*pl->contr->ns, sl, op);
 
-  pl->contr->socket->send_packet (sl);
+  pl->contr->ns->send_packet (sl);
   SET_FLAG (op, FLAG_CLIENT_SENT);
 }
 
@@ -534,12 +670,11 @@
 void
 esrv_del_item (player *pl, int tag)
 {
-  packet sl;
+  packet sl ("delitem");
 
-  sl << "delitem "
-     << uint32 (tag);
+  sl << uint32 (tag);
 
-  pl->socket->send_packet (sl);
+  pl->ns->send_packet (sl);
 }
 
 
@@ -570,7 +705,7 @@
         if (tmp->count == count)
           return tmp;
 
-  for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above)
+  for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
     if (op->head && op->head->count == count)
       return op;
     else if (op->count == count)
@@ -620,8 +755,8 @@
   /* If the high bit is set, player applied a pseudo object. */
   if (tag & 0x80000000)
     {
-      pl->socket->look_position = tag & 0x7fffffff;
-      pl->socket->update_look = 1;
+      pl->ns->look_position = tag & 0x7fffffff;
+      pl->ns->floorbox_update ();
       return;
     }
 
@@ -636,7 +771,7 @@
   player_apply (pl->ob, op, 0, 0);
 }
 
-/** Client wants to apply some object.  Lets do so. */
+/** Client wants to lock some object. Lets do so. */
 void
 LockItem (char *data, int len, player *pl)
 {
@@ -658,7 +793,7 @@
   esrv_update_item (UPD_FLAGS, pl->ob, op);
 }
 
-/** Client wants to apply some object.  Lets do so. */
+/** Client wants to mark some object.  Lets do so. */
 void
 MarkItem (char *data, int len, player *pl)
 {
@@ -699,7 +834,7 @@
   if (!m)
     return;
 
-  for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
+  for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
 
   for (; tmp != NULL; tmp = tmp->below)
     {
@@ -756,10 +891,10 @@
     }
   dy = atoi (cp);
 
-  if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2)
+  if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2)
     return;
 
-  if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2])
+  if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
     return;
 
   look_at (pl->ob, dx, dy);