diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-19 19:23:31 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-19 19:23:31 +0000 |
| commit | d5f91332d6bd79a8e8c992d5f0cc0fe735d0e85a (patch) | |
| tree | 0ece4d730649a0547205a366396d5f5c720d2edb /crawl-ref/source/misc.cc | |
| parent | 5f61c3caf7af3eee7467d860d4b284bbcd7b6f70 (diff) | |
| download | crawl-ref-d5f91332d6bd79a8e8c992d5f0cc0fe735d0e85a.tar.gz crawl-ref-d5f91332d6bd79a8e8c992d5f0cc0fe735d0e85a.zip | |
Fix an inverted use of parameters when calling
get_player_visible_monsters, and state "Not with a mimic in view" for
known mimics rather than listing the object type since that seems a
bit weird.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5137 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/misc.cc')
| -rw-r--r-- | crawl-ref/source/misc.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index df7954876d..d5d3916265 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -2636,7 +2636,7 @@ void get_playervisible_monsters(std::vector<monsters*> &mons, if ( see_grid(x,y) ) { monsters *mon = &env.mons[targ_monst]; - if ( player_monster_visible(mon) + if (player_monster_visible(mon) && !mons_is_submerged(mon) && (!mons_is_mimic(mon->type) || mons_is_known_mimic(mon)) @@ -2682,7 +2682,7 @@ bool i_feel_safe(bool announce, bool want_move, bool just_monsters, int range) // monster check std::vector<monsters*> visible; - get_playervisible_monsters(visible, !announce, want_move, true, range); + get_playervisible_monsters(visible, want_move, !announce, true, range); // No monsters found. if (visible.empty()) @@ -2694,8 +2694,10 @@ bool i_feel_safe(bool announce, bool want_move, bool just_monsters, int range) const monsters &m = *visible[0]; if (announce) { - mprf(MSGCH_WARN, "Not with %s in view!", - m.name(DESC_NOCAP_A).c_str()); + std::string monname = + (mons_is_mimic(m.type)) ? "the mimic" : m.name(DESC_NOCAP_A); + + mprf(MSGCH_WARN, "Not with %s in view!", monname.c_str()); } else tutorial_first_monster(m); |