--- deliantra/server/socket/item.C	2008/08/31 02:01:41	1.70
+++ deliantra/server/socket/item.C	2009/11/29 09:41:28	1.85
@@ -5,18 +5,19 @@
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
@@ -49,7 +50,7 @@
  *  This is a similar to query_name, but returns flags
  *  to be sent to client. 
  */
-unsigned int
+static unsigned int
 query_flags (object *op)
 {
   unsigned int flags = 0;
@@ -87,7 +88,7 @@
           break;
       }
 
-  if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
+  if (op->is_open_container ())
     flags |= F_OPEN;
 
   if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
@@ -115,10 +116,8 @@
 static void
 add_object_to_socklist (client &ns, packet &sl, object *head)
 {
-  char item_n[MAX_BUF];
-  const char *item_p;
-
   int flags = query_flags (head);
+
   if (QUERY_FLAG (head, FLAG_NO_PICK))
     flags |= F_NOPICK;
 
@@ -133,33 +132,32 @@
      << 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);
-      item_n[127] = 0;
-      len = strlen (item_n);
-      item_p = query_base_name (head, 1);
+      const char *name;
+      uint8 *len = sl.cur++; // patch up length later
+
+      name = query_base_name (head, 0); sl << data (name, min (127, strlen (name)));
+      sl << uint8 (0);
+      name = query_base_name (head, 1); sl << data (name, min (127, strlen (name)));
+
+      *len = sl.cur - len - 1;
     }
   else
     {
-      strncpy (item_n, head->custom_name, 127);
-      item_n[127] = 0;
-      len = strlen (item_n);
-      item_p = head->custom_name;
-    }
+      int len = min (head->custom_name.length (), 127);
 
-  strncpy (item_n + len + 1, item_p, 127);
-  item_n[254] = 0;
-  len += strlen (item_n + 1 + len) + 1;
+      sl << uint8 (len * 2 + 1)
+         << data (head->custom_name, len)
+         << uint8 (0)
+         << data (head->custom_name, len);
+    }
 
-  sl << data8 (item_n, len)
-     << uint16 (head->animation_id);
+  sl << uint16 (head->animation_id);
 
   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.);
+                 :                              1. / clamp (head->speed, 1./255., 1./1.);
 
   sl << uint8  (anim_speed)
      << uint32 (head->nrof);
@@ -401,9 +399,9 @@
 
   if (flags & UPD_WEIGHT)
     {
-      sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
+      sint32 weight = op->client_weight ();
 
-      if (op)
+      if (op == pl)
         ns->last_weight = weight;
 
       sl << uint32 (weight);
@@ -420,26 +418,20 @@
     {
       int len;
       const char *item_p;
-      char item_n[MAX_BUF];
+      char item_n[127 * 2];
 
       if (!op->custom_name)
         {
-          strncpy (item_n, query_base_name (op, 0), 127);
-          item_n[127] = 0;
-          len = strlen (item_n);
+          len = assign (item_n, query_base_name (op, 0), 127);
           item_p = query_base_name (op, 1);
         }
       else
         {
-          strncpy (item_n, op->custom_name, 127);
-          item_n[127] = 0;
-          len = strlen (item_n);
-          item_p = op->custom_name;
+          len = assign (item_n, &op->custom_name, 127);
+          item_p = &op->custom_name;
         }
 
-      strncpy (item_n + len + 1, item_p, 127);
-      item_n[254] = 0;
-      len += strlen (item_n + 1 + len) + 1;
+      len += assign (item_n + len, item_p, 127);
 
       sl << data8 (item_n, len);
     }
@@ -457,12 +449,12 @@
             anim_speed = op->anim_speed;
           else
             {
-              if (fabs (op->speed) < 0.001)
+              if (op->speed < 0.001)
                 anim_speed = 255;
-              else if (fabs (op->speed) >= 1.0)
+              else if (op->speed >= 1.0)
                 anim_speed = 1;
               else
-                anim_speed = (int) (1.0 / fabs (op->speed));
+                anim_speed = 1. / op->speed;
             }
 
           if (anim_speed > 255)
@@ -531,7 +523,7 @@
  * Takes a player and object count (tag) and returns the actual object
  * pointer, or null if it can't be found.
  */
-object *
+static object *
 esrv_get_ob_from_count (object *pl, tag_t count)
 {
   if (pl->count == count)
@@ -540,7 +532,7 @@
   for (object *op = pl->inv; op; op = op->below)
     if (op->count == count)
       return op;
-    else if (op->type == CONTAINER && pl->container == op)
+    else if (op->type == CONTAINER && pl->container_ () == op)
       for (object *tmp = op->inv; tmp; tmp = tmp->below)
         if (tmp->count == count)
           return tmp;
@@ -550,7 +542,7 @@
       return op;
     else if (op->count == count)
       return op;
-    else if (op->type == CONTAINER && pl->container == op)
+    else if (op->type == CONTAINER && pl->container_ () == op)
       for (object *tmp = op->inv; tmp; tmp = tmp->below)
         if (tmp->count == count)
           return tmp;
@@ -599,11 +591,9 @@
     {
       std::string s = op->describe (pl->ob);
 
-      if (msg_is_special (s.c_str (), false))
-        cfperl_expand_cfpod (pl, s);
-
       packet sl ("ex");
-      sl << ber32 (tag) << s.c_str ();
+      sl << ber32 (tag)
+         << data (*pl->expand_cfpod (s.c_str ()));
 
       pl->ns->send_packet (sl);
     }
@@ -682,41 +672,70 @@
 static void
 look_at (player *pl, int dx, int dy)
 {
-  dynbuf_text buf;
+  dynbuf_text &buf = msg_dynbuf; buf.clear ();
   object *ob = pl->ob;
 
   if (!pl->observe->map)
     return;
 
+  bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
+
   mapxy pos (pl->observe);
   pos.move (dx, dy);
 
-  if (pos.normalise ())
-    for (object *tmp = pos->top; tmp; tmp = tmp->below)
-      {
-        if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
-          continue;
+  if (wiz)
+    {
+      if (pos.normalise ())
+        {
+          mapspace &ms = *pos;
+          ms.update ();
 
-        if (QUERY_FLAG (ob, FLAG_WIZ))
-          buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
-        else
-          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.printf (" map: %s%+d%+d (%+d%+d)\n"
+                      " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; items %d, volume %lld\n\n",
+                      &pos.m->path, pos.x, pos.y, dx, dy,
+                      (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
+                      ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.items (), (long long)ms.volume ()
+                     );
+        }
+      else
+        buf << "off-map\n\n";
+    }
 
-        if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ))        /* don't continue under the floor */
-          break;
-      }
+  int darkness = pl->blocked_los (dx, dy);
 
-  if (buf.empty ())
-    pl->failmsg ("You see nothing there.");
+  if (darkness == LOS_BLOCKED)
+    buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>";
+  else if (darkness == LOS_MAX)
+    buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>";
   else
-    pl->infobox (MSG_CHANNEL ("lookat"), buf);
+    {
+      if (pos.normalise ())
+        for (object *tmp = pos->top; tmp; tmp = tmp->below)
+          {
+            if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
+              continue;
+
+            if (wiz)
+              buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
+            else
+              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, "   ");
+
+            if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !wiz)        /* don't continue under the floor */
+              break;
+          }
+    }
+
+  if (buf.empty ())
+    buf << "You see nothing there.";
+
+  pl->infobox (MSG_CHANNEL ("lookat"), buf);
 }
 
 /** Client wants to look at some object.  Lets do so. */
@@ -731,16 +750,6 @@
 
   int dy = atoi (cp);
 
-  if (player *opl = pl->observe->contr)
-    if (client *ns = opl->ns)
-      {
-        if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
-          return;
-
-        if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
-          return;
-      }
-
   look_at (pl, dx, dy);
 }
 
@@ -765,7 +774,7 @@
        */
       if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
         {
-          int cnt = MAX_ITEM_PER_DROP;
+          int cnt = MAX_ITEM_PER_ACTION;
 
           for (object *current = op->inv; current && cnt--; )
             {