From 622b92a486244f2277cbba187cc39f600efbf1bc Mon Sep 17 00:00:00 2001 From: dshaligram Date: Fri, 22 Aug 2008 12:07:06 +0000 Subject: 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 --- crawl-ref/source/misc.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 &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))) -- cgit v1.2.3-54-g00ecf