diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-11-13 16:06:13 +0100 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-13 16:38:47 +0100 |
| commit | 432f4a3b29385564301a99578f3dd0896e9e3b1e (patch) | |
| tree | e64789ef153523bab2b0dc03efeab4f45489ee0d /crawl-ref/source/mon-stuff.cc | |
| parent | e63d9087da8771801644e1103d8f869d4576590c (diff) | |
| download | crawl-ref-432f4a3b29385564301a99578f3dd0896e9e3b1e.tar.gz crawl-ref-432f4a3b29385564301a99578f3dd0896e9e3b1e.zip | |
Remove a few redundant arena visibility checks.
Diffstat (limited to 'crawl-ref/source/mon-stuff.cc')
| -rw-r--r-- | crawl-ref/source/mon-stuff.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc index c9d389fddc..c653edd29f 100644 --- a/crawl-ref/source/mon-stuff.cc +++ b/crawl-ref/source/mon-stuff.cc @@ -1594,8 +1594,7 @@ int monster_die(monsters *monster, killer_type killer, const bool death_message = !silent && !did_death_message && mons_near(monster) - && (monster->visible_to(&you) - || crawl_state.arena); + && monster->visible_to(&you); const bool exploded = monster->flags & MF_EXPLODE_KILL; const bool created_friendly = testbits(monster->flags, MF_CREATED_FRIENDLY); @@ -3049,9 +3048,9 @@ bool simple_monster_message(const monsters *monster, const char *event, description_level_type descrip) { - if ((mons_near(monster) || crawl_state.arena) + if (mons_near(monster) && (channel == MSGCH_MONSTER_SPELL || channel == MSGCH_FRIEND_SPELL - || monster->visible_to(&you) || crawl_state.arena)) + || monster->visible_to(&you))) { std::string msg = monster->name(descrip); msg += event; |