From d813da0afb4ebeea2c25dbdae36060eee5424d45 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 1 Jun 2009 15:34:21 +0000 Subject: Apply r9873 to trunk. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9874 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/directn.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/directn.cc') diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 165aae3fec..e24ddacbb8 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -1733,8 +1733,9 @@ void direction(dist& moves, targeting_type restricts, std::string get_terse_square_desc(const coord_def &gc) { - std::string desc; + std::string desc = ""; const char *unseen_desc = "[unseen terrain]"; + if (gc == you.pos()) desc = you.your_name; else if (!map_bounds(gc)) @@ -1763,7 +1764,10 @@ std::string get_terse_square_desc(const coord_def &gc) desc = mons.full_name(DESC_PLAIN, true); } else if (igrd(gc) != NON_ITEM) - desc = mitm[igrd(gc)].name(DESC_PLAIN); + { + if (is_valid_item(mitm[igrd(gc)])) + desc = mitm[igrd(gc)].name(DESC_PLAIN); + } else desc = feature_description(gc, false, DESC_PLAIN, false); @@ -1812,7 +1816,8 @@ void get_square_desc(const coord_def &c, describe_info &inf, { // Second priority: objects. // If examine_mons is true, use terse descriptions. - get_item_desc(mitm[oid], inf, examine_mons); + if (is_valid_item(mitm[oid])) + get_item_desc(mitm[oid], inf, examine_mons); } else { -- cgit v1.2.3-54-g00ecf