--- deliantra/server/socket/item.C	2008/08/31 02:01:41	1.70
+++ deliantra/server/socket/item.C	2009/04/27 01:38:49	1.78
@@ -401,9 +401,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 +420,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);
     }
@@ -599,11 +593,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 +674,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 (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, "  ");
-
-        if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ))        /* don't continue under the floor */
-          break;
-      }
+  if (wiz)
+    {
+      if (pos.normalise ())
+        {
+          mapspace &ms = *pos;
+          ms.update ();
 
-  if (buf.empty ())
-    pl->failmsg ("You see nothing there.");
+          buf.printf (" map: %s%+d%+d (%+d%+d)\n"
+                      " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; 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, (long long)ms.volume ()
+                     );
+        }
+      else
+        buf << "off-map\n\n";
+    }
+
+  int darkness = pl->blocked_los (dx, dy);
+
+  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 +752,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);
 }