From 432f4a3b29385564301a99578f3dd0896e9e3b1e Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Fri, 13 Nov 2009 16:06:13 +0100 Subject: Remove a few redundant arena visibility checks. --- crawl-ref/source/mon-stuff.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'crawl-ref') 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; -- cgit v1.2.3-54-g00ecf