summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-24 06:26:17 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-24 06:26:17 +0000
commita7ba97bc95fa25180bd402a52943f223da2bf04a (patch)
tree222d060ee7b4033fb4fb02e9f56d5812f4beda62 /crawl-ref/source
parentb1932b010b489debc3ccaef344e991279e5bf983 (diff)
downloadcrawl-ref-a7ba97bc95fa25180bd402a52943f223da2bf04a.tar.gz
crawl-ref-a7ba97bc95fa25180bd402a52943f223da2bf04a.zip
Fixed x_ and other feature hotkeys not working in the Abyss (cbus).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6662 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/view.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 66ad912d8f..d5da2f7b3f 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -198,7 +198,7 @@ static void _update_minimap(int x, int y)
{
int object = env.map[x][y].object;
map_feature f = (object >= DNGN_START_OF_MONSTERS) ? MF_MONS_HOSTILE :
- Feature[object].minimap;
+ Feature[object].minimap;
if (f == MF_SKIP)
f = Feature[grd[x][y]].minimap;
@@ -1170,7 +1170,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);
@@ -2720,7 +2720,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, const coord_def& where)
{
- if (!env.map(where).object)
+ if (!env.map(where).object && !see_grid(where))
return (false);
// 'grid' can fit in an unsigned char, but making this a short shuts up