diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-10-22 19:13:56 +0200 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-10-22 22:37:09 +0200 |
| commit | 1fdd4abbce290f4d656bf29ce65d70ab5025871d (patch) | |
| tree | c258b3f9f522191f19f3c45315969905be4d9aa8 /crawl-ref/source/monstuff.cc | |
| parent | 8d4d79655dd503417920299808993cef658bdde0 (diff) | |
| download | crawl-ref-1fdd4abbce290f4d656bf29ce65d70ab5025871d.tar.gz crawl-ref-1fdd4abbce290f4d656bf29ce65d70ab5025871d.zip | |
Get rid of player_monster_visible.
The special casing for drowning monsters appears to have been
obsoloted by checking ENCH_SUBMERGED instead of calling
mons_is_submerged.
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index e73bdfb52c..5c0c7000de 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1436,7 +1436,7 @@ int monster_die(monsters *monster, killer_type killer, const bool death_message = !silent && !did_death_message && mons_near(monster) - && (player_monster_visible(monster) + && (monster->visible_to(&you) || crawl_state.arena); const bool created_friendly = testbits(monster->flags, MF_CREATED_FRIENDLY); @@ -1975,7 +1975,7 @@ int monster_die(monsters *monster, killer_type killer, } // If we kill an invisible monster reactivate autopickup. - if (mons_near(monster) && !player_monster_visible(monster)) + if (mons_near(monster) && !monster->visible_to(&you)) autotoggle_autopickup(false); crawl_state.dec_mon_acting(monster); @@ -4960,7 +4960,7 @@ bool simple_monster_message(const monsters *monster, const char *event, if ((mons_near(monster) || crawl_state.arena) && (channel == MSGCH_MONSTER_SPELL || channel == MSGCH_FRIEND_SPELL - || player_monster_visible(monster) || crawl_state.arena)) + || monster->visible_to(&you) || crawl_state.arena)) { std::string msg = monster->name(descrip); msg += event; |