--- deliantra/server/socket/item.C	2007/07/29 19:11:47	1.52
+++ deliantra/server/socket/item.C	2007/09/30 20:22:25	1.53
@@ -840,58 +840,38 @@
 static void
 look_at (player *pl, int dx, int dy)
 {
+  dynbuf_text buf;
   object *ob = pl->ob;
 
-  maptile *m = pl->observe->map;
-  sint16 x = pl->observe->x + dx;
-  sint16 y = pl->observe->y + dy;
-
-  if (!m)
-    return;
-
-  if (!xy_normalise (m, x, y))
-    {
-      new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
-      return;
-    }
-
-  int flag = 0;
-
-  for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below)
-    {
-      if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
-        continue;
-
-      if (!flag)
-        {
-          if (dx || dy)
-            new_draw_info (NDI_UNIQUE, 0, ob, "There you see:");
-          else
-            new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
-
-          flag = 1;
-        }
-
-      if (QUERY_FLAG (ob, FLAG_WIZ))
-        new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count);
-      else
-        new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp));
-
-      if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
-           (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ))
-        inventory (ob, tmp->head == NULL ? tmp : tmp->head);
-
-      if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ))        /* don't continue under the floor */
-        break;
-    }
-
-  if (!flag)
-    {
-      if (dx || dy)
-        new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
-      else
-        new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing.");
-    }
+  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 (buf.empty ())
+    pl->failmsg ("You see nothing there.");
+  else
+    pl->infobox (MSG_CHANNEL ("lookat"), buf);
 }
 
 /** Client wants to look at some object.  Lets do so. */