summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-10 07:39:56 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-10 07:39:56 +0000
commit172979dfbcd139f1adba90624340e9e6e5184cae (patch)
tree6287fab7427e83a89b04724d4d0fa6b3c4cfe519
parent6d1ec443f172f71c14482ab688ce41d0f950b920 (diff)
downloadcrawl-ref-172979dfbcd139f1adba90624340e9e6e5184cae.tar.gz
crawl-ref-172979dfbcd139f1adba90624340e9e6e5184cae.zip
Better output for "list items" wizard command (&').
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5697 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/acr.cc26
1 files changed, 11 insertions, 15 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 6c10e2c99d..5c1ddc6550 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1087,21 +1087,20 @@ static void _handle_wizard_command( void )
break;
case '\'':
+ mpr("Item stacks (by location and top item):");
for (i = 0; i < MAX_ITEMS; i++)
{
- if (mitm[i].link == NON_ITEM)
+ item_def &item(mitm[i]);
+ if (!is_valid_item(item) || item.x == 0 || item.y == 0)
continue;
- mprf("item:%3d link:%3d cl:%3d ty:%3d pl:%3d pl2:%3d "
- "sp:%3ld q:%3d",
- i, mitm[i].link,
- mitm[i].base_type, mitm[i].sub_type,
- mitm[i].plus, mitm[i].plus2, mitm[i].special,
- mitm[i].quantity );
+ if (item.link != NON_ITEM)
+ mprf("(%2d,%2d): %s", item.x, item.y,
+ item.name(DESC_PLAIN, false, false, false).c_str() );
}
- mpr("igrid:");
-
+ mpr("");
+ mpr("Floor items (stacks only show top item):");
for (i = 0; i < GXM; i++)
for (j = 0; j < GYM; j++)
@@ -1109,15 +1108,12 @@ static void _handle_wizard_command( void )
int item = igrd[i][j];
if (item != NON_ITEM)
{
- mprf("%3d at (%2d,%2d), cl:%3d ty:%3d pl:%3d pl2:%3d "
- "sp:%3ld q:%3d",
+ mprf("%3d at (%2d,%2d): %s",
item, i, j,
- mitm[item].base_type, mitm[item].sub_type,
- mitm[item].plus, mitm[item].plus2, mitm[item].special,
- mitm[item].quantity );
+ mitm[item].name(DESC_PLAIN, false, false,
+ false).c_str() );
}
}
-
break;
default: