diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-31 02:20:47 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-31 02:20:47 +0000 |
| commit | 1e171939b24d0884f7b85ee4bda0da1d3613a6ca (patch) | |
| tree | 94a1ddfd4e6608869df0e595f6cc0d2a2847a7a9 | |
| parent | 69a12f879afe1206926d96b7216dda13a7e8ca06 (diff) | |
| download | crawl-ref-1e171939b24d0884f7b85ee4bda0da1d3613a6ca.tar.gz crawl-ref-1e171939b24d0884f7b85ee4bda0da1d3613a6ca.zip | |
Trunk->0.3 merge (2697): Fixed explore mimic handling.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2698 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/travel.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index d8102554bd..3295f550a3 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -351,11 +351,12 @@ void set_exclude(const coord_def &p, int radius) static bool is_monster_blocked(int x, int y) { - const int mon = mgrd[x][y]; - return (mon != NON_MONSTER - && player_monster_visible(&menv[mon]) - && mons_is_stationary(&menv[mon]) - && mons_was_seen(&menv[mon])); + const monsters *mons = monster_at(coord_def(x, y)); + return (mons + && player_monster_visible(mons) + && mons_is_stationary(mons) + && mons_was_seen(mons) + && (!mons_is_mimic(mons->type) || mons_is_known_mimic(mons))); } /* |