--- deliantra/server/socket/item.C 2007/07/29 19:11:47 1.52
+++ deliantra/server/socket/item.C 2007/11/08 19:43:29 1.55
@@ -1,11 +1,11 @@
/*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
* Copyright (©) 1992,2007 Frank Tore Johansen
*
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * 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.
@@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*
- * The authors can be reached via e-mail to
+ * The authors can be reached via e-mail to
*/
/**
@@ -840,58 +840,41 @@
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)
+ if (!pl->observe->map)
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));
+ mapxy pos (pl->observe);
+ pos.move (dx, dy);
- 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 (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 (!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.");
- }
+ 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. */