summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-24 06:32:09 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-24 06:32:09 +0000
commit0857fa5f6d870e43409b00423683666bc5fb86ea (patch)
tree741da167001ab97ce7d6f77df62454478f874ecd
parentbf8210ed870bd1cccb470f2a9a699e8d79e07f60 (diff)
downloadcrawl-ref-0857fa5f6d870e43409b00423683666bc5fb86ea.tar.gz
crawl-ref-0857fa5f6d870e43409b00423683666bc5fb86ea.zip
Trunk->0.4 r6662: Fixed x_ and other feature hotkeys not working in the Abyss (cbus).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6663 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/view.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index c2fb6f4870..efe1e7bb3d 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -1149,7 +1149,7 @@ void monster_grid(bool do_updates)
// circumstances so we can track down where this is coming
// from.
mprf(MSGCH_DIAGNOSTICS, "monster (%d) at (%d, %d) was "
- "improperly placed. Updating mgrd.", s,
+ "improperly placed. Updating mgrd.", s,
monster->x, monster->y);
#endif
ASSERT(mgrd[monster->x][monster->y] == NON_MONSTER);
@@ -2694,7 +2694,7 @@ void losight(env_show_grid &sh,
// 5. Anything else will look for the exact same character in the level map.
bool is_feature(int feature, int x, int y)
{
- if (!env.map[x][y].object)
+ if (!env.map[x][y].object && !see_grid(x, y))
return (false);
// 'grid' can fit in an unsigned char, but making this a short shuts up