summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilereg.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-21 17:54:43 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-21 17:54:43 +0000
commit0e472a37cd47225bb6660aa9f7d12320f7cd4582 (patch)
treed50e76bcb67c83f1bc6c7fbea08122302d6d00c4 /crawl-ref/source/tilereg.cc
parenta36fd3f9f0e5bde3dd9d74e1742cfbd2f045c635 (diff)
downloadcrawl-ref-0e472a37cd47225bb6660aa9f7d12320f7cd4582.tar.gz
crawl-ref-0e472a37cd47225bb6660aa9f7d12320f7cd4582.zip
* Fix 2862312: examination of items in shops not working after buying
something * FR 2836364 : Make controlled blink contaminate the player. * Fix 2841232: display "very slow" in the % screen. * FR 2858960 : Re-add mouseover descriptions for previously seen (but not detected) features out of sight, and for plain floor the stash description like when using 'x'. * Disallow placement of corpses within walls, and allow rock worms to leave corpses elsewhere. * Minor tweaks to the documentation. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10766 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilereg.cc')
-rw-r--r--crawl-ref/source/tilereg.cc15
1 files changed, 13 insertions, 2 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index 2cd1c855b1..a3b43a539d 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -31,6 +31,7 @@ REVISION("$Rev$");
#include "spl-book.h"
#include "spl-cast.h"
#include "spl-util.h"
+#include "stash.h"
#include "stuff.h"
#include "terrain.h"
#include "transfor.h"
@@ -1477,13 +1478,23 @@ bool DungeonRegion::update_alt_text(std::string &alt)
return (false);
if (!map_bounds(gc))
return (false);
- if (!see_grid(gc))
+ if (!is_terrain_seen(gc))
return (false);
if (you.last_clicked_grid == gc)
return (false);
describe_info inf;
- get_square_desc(gc, inf, true);
+ if (see_grid(gc))
+ get_square_desc(gc, inf, true);
+ else if (grd(gc) != DNGN_FLOOR)
+ get_feature_desc(gc, inf);
+ else
+ {
+ // For plain floor, output the stash description.
+ std::string stash = get_stash_desc(gc.x, gc.y);
+ if (!stash.empty())
+ inf.body << "$" << stash;
+ }
alt_desc_proc proc(crawl_view.msgsz.x, crawl_view.msgsz.y);
process_description<alt_desc_proc>(proc, inf);