--- deliantra/server/socket/item.C	2006/12/14 01:59:10	1.17
+++ deliantra/server/socket/item.C	2007/01/08 18:18:36	1.31
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -32,16 +33,153 @@
  * the logic for what items should be sent.
  */
 
-
 #include <global.h>
 #include <object.h>             /* LOOK_OBJ */
-#include <newclient.h>
-#include <newserver.h>
 #include <sproto.h>
 
 /** 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.
@@ -50,7 +188,7 @@
 
 /**
  *  This is a similar to query_name, but returns flags
- *  to be sended to client. 
+ *  to be sent to client. 
  */
 unsigned int
 query_flags (object *op)
@@ -61,36 +199,37 @@
     {
       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;
+          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;
 
@@ -101,6 +240,7 @@
       else if (QUERY_FLAG (op, FLAG_CURSED))
         flags |= F_CURSED;
     }
+
   if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
     flags |= F_MAGIC;
   if (QUERY_FLAG (op, FLAG_UNPAID))
@@ -116,7 +256,7 @@
  * animation of face to the client.
  */
 static void
-add_object_to_socklist (NewSocket &ns, packet &sl, object *head)
+add_object_to_socklist (client &ns, packet &sl, object *head)
 {
   int flags, len, anim_speed;
   char item_n[MAX_BUF];
@@ -189,11 +329,10 @@
 
 
 /**
- * Send the look window.  Don't need to do animations here 
- * This sends all the faces to the client, not just updates.  This is
- * because object ordering would otherwise be inconsistent
+ * Send the look window. Don't need to do animations here 
+ * This sends all the faces to the client, not just updates. This is
+ * because object ordering would otherwise be inconsistent.
  */
-
 void
 esrv_draw_look (object *pl)
 {
@@ -201,13 +340,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
@@ -215,34 +354,34 @@
       || 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)
     {
-      sl << uint32 (0x80000000 | (pl->contr->socket.look_position - NUM_LOOK_OBJECTS))
+      char buf[80];
+      snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
+
+      sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
          << uint32 (0)
          << sint32 (-1)
-         << uint32 (empty_face->number);
-
-      sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS);
-
-      sl << uint16 (0)
+         << uint32 (empty_face->number)
+         << data8 (buf)
+         << uint16 (0)
          << uint8  (0)
          << uint32 (0);
 
-      if (pl->contr->socket.itemcmd == 2)
+      if (pl->contr->ns->itemcmd == 2)
         sl << uint16 (0);
     }
 
@@ -259,28 +398,26 @@
 
       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);
-
-              sl.printf ("Click here to see next group of items");
-
-              sl << uint16 (0)
+                 << uint32 (empty_face->number)
+                 << data8  ("Apply this to see next group of items")
+                 << uint16 (0)
                  << uint8  (0)
                  << uint32 (0);
 
-              if (pl->contr->socket.itemcmd == 2)
+              if (pl->contr->ns->itemcmd == 2)
                 sl << uint16 (0);
 
               break;
@@ -291,23 +428,23 @@
           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))
             {
-              Send_With_Handling (&pl->contr->socket, &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;
             }
-        }                       /* If LOOK_OBJ() */
+        }
     }
   
   if (got_one)
-    Send_With_Handling (&pl->contr->socket, &sl);
+    pl->contr->ns->send_packet (sl);
 
 }
 
@@ -320,13 +457,11 @@
   object *tmp;
   int got_one = 0;
 
-  packet sl;
 
-  sl.printf ("delinv %d", op->count);
-  Send_With_Handling (&pl->contr->socket, &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);
 
@@ -341,7 +476,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++;
 
@@ -351,10 +486,10 @@
            */
           if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
             {
-              Send_With_Handling (&pl->contr->socket, &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;
             }
@@ -362,8 +497,7 @@
     }
 
   if (got_one)
-    Send_With_Handling (&pl->contr->socket, &sl);
-
+    pl->contr->ns->send_packet (sl);
 }
 
 /**
@@ -388,6 +522,10 @@
        */
     }
 
+  client *ns = pl->contr->ns;
+  if (!ns)
+    return;
+
   if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
     {
       /* FLAG_CLIENT_SENT is debug only.  We are using it to see where
@@ -397,10 +535,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;
@@ -420,13 +557,13 @@
       sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
 
       if (pl == op)
-        op->contr->last_weight = weight;
+        ns->last_weight = weight;
     }
 
   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 (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE))
+        esrv_send_face (ns, op->face->number, 0);
 
       sl << uint32 (op->face->number);
     }
@@ -490,7 +627,7 @@
   if (flags & UPD_NROF)
     sl << uint32 (op->nrof);
 
-  Send_With_Handling (&pl->contr->socket, &sl);
+  pl->contr->ns->send_packet (sl);
 }
 
 /**
@@ -510,25 +647,24 @@
        */
       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);
 
-  Send_With_Handling (&pl->contr->socket, &sl);
+  pl->contr->ns->send_packet (sl);
   SET_FLAG (op, FLAG_CLIENT_SENT);
-
 }
 
 /**
@@ -539,12 +675,11 @@
 void
 esrv_del_item (player *pl, int tag)
 {
-  packet sl;
+  packet sl ("delitem");
 
-  sl << "delitem "
-     << uint32 (tag);
+  sl << uint32 (tag);
 
-  Send_With_Handling (&pl->socket, &sl);
+  pl->ns->send_packet (sl);
 }
 
 
@@ -575,8 +710,8 @@
         if (tmp->count == count)
           return tmp;
 
-  for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above)
-    if (op->head != NULL && op->head->count == count)
+  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)
       return op;
@@ -585,7 +720,7 @@
         if (tmp->count == count)
           return tmp;
 
-  return NULL;
+  return 0;
 }
 
 
@@ -610,7 +745,7 @@
   examine (pl->ob, op);
 }
 
-/** Client wants to apply some object.  Lets do so. */
+/** Client wants to apply some object. Lets do so. */
 void
 ApplyCmd (char *buf, int len, player *pl)
 {
@@ -625,8 +760,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;
     }
 
@@ -641,12 +776,12 @@
   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 (uint8 *data, int len, player *pl)
+LockItem (char *data, int len, player *pl)
 {
   int flag = data[0];
-  tag_t tag = net_uint32 (data + 1);
+  tag_t tag = net_uint32 ((uint8 *)data + 1);
   object *op = esrv_get_ob_from_count (pl->ob, tag);
 
   if (!op)
@@ -663,11 +798,11 @@
   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 (uint8 * data, int len, player *pl)
+MarkItem (char *data, int len, player *pl)
 {
-  tag_t tag = net_uint32 (data);
+  tag_t tag = net_uint32 ((uint8 *)data);
   object *op = esrv_get_ob_from_count (pl->ob, tag);
 
   if (!op)
@@ -704,7 +839,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)
     {
@@ -761,10 +896,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);
@@ -804,9 +939,8 @@
           esrv_update_item (UPD_WEIGHT, pl, op);
         }
       else
-        {
-          drop_object (pl, op, nrof);
-        }
+        drop_object (pl, op, nrof);
+
       return;
     }
   else if (to == pl->count)
@@ -833,8 +967,6 @@
    * 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);
-    }
+    put_object_in_sack (pl, env, op, nrof);
 }