diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-21 19:43:00 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-21 19:43:00 +0000 |
commit | f284d478404c39e10de085fe203d8891db73e95c (patch) | |
tree | 5b8a42298a940023e0ce00b360c3268a7e75a680 /crawl-ref/source/tilereg.cc | |
parent | 7c84d174a0e077e2582a3bdbda5ed6c3b84f7787 (diff) | |
download | crawl-ref-f284d478404c39e10de085fe203d8891db73e95c.tar.gz crawl-ref-f284d478404c39e10de085fe203d8891db73e95c.zip |
Backport oos mouseover descriptions for Tiles, corpses not being dropped
inside walls, and LRD not working at low levels.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10768 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilereg.cc')
-rw-r--r-- | crawl-ref/source/tilereg.cc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index 66b0fb1a05..1ddc68a0e2 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -28,6 +28,7 @@ REVISION("$Rev$"); #include "player.h" #include "religion.h" #include "spells3.h" +#include "stash.h" #include "stuff.h" #include "terrain.h" #include "transfor.h" @@ -1506,13 +1507,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); |