diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-22 12:07:06 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-22 12:07:06 +0000 |
| commit | 622b92a486244f2277cbba187cc39f600efbf1bc (patch) | |
| tree | b18e8c8cb6d9b3cc41d06fee4165071d6619e458 | |
| parent | 7b97377e3cb050b67dcff93da54142371213b1d7 (diff) | |
| download | crawl-ref-622b92a486244f2277cbba187cc39f600efbf1bc.tar.gz crawl-ref-622b92a486244f2277cbba187cc39f600efbf1bc.zip | |
Trunk->0.4 r6848: [2067336] Fix mlist crash.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6849 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/misc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 4e54fbdf75..687f8c86f9 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -2373,7 +2373,8 @@ void get_playervisible_monsters(std::vector<monsters*> &mons, if (see_grid(*ri)) { monsters *mon = &env.mons[targ_monst]; - if (player_monster_visible(mon) + if (mon->alive() + && player_monster_visible(mon) && !mons_is_submerged(mon) && (!mons_is_mimic(mon->type) || mons_is_known_mimic(mon)) && (!dangerous_only || !mons_is_safe(mon, want_move))) |