diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2012-03-26 23:51:31 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2012-03-26 23:56:36 +0200 |
| commit | 2c8c99fec4aab48970d75030ece87dda40260e78 (patch) | |
| tree | ed687319685e936cb25b8fa046c01209c36c7525 /crawl-ref/source/mon-speak.cc | |
| parent | 01c2aa8463804cdd4ff8818b78c1deb890a78efb (diff) | |
| parent | 537a8dfbb6582c8269e3239b63a5d2ea03eb77a3 (diff) | |
| download | crawl-ref-2c8c99fec4aab48970d75030ece87dda40260e78.tar.gz crawl-ref-2c8c99fec4aab48970d75030ece87dda40260e78.zip | |
Merge branch 'master' into portal_branches
This includes fixes for 64834896234968 places in master that add new uses of
LEVEL_FOO and so on.
Diffstat (limited to 'crawl-ref/source/mon-speak.cc')
| -rw-r--r-- | crawl-ref/source/mon-speak.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/mon-speak.cc b/crawl-ref/source/mon-speak.cc index 63492ebbc0..56e9098397 100644 --- a/crawl-ref/source/mon-speak.cc +++ b/crawl-ref/source/mon-speak.cc @@ -474,7 +474,7 @@ bool mons_speaks(monster* mons) &you : mons->get_foe(); const monster* m_foe = foe ? foe->as_monster() : NULL; - if (!foe || foe->atype() == ACT_PLAYER || mons->wont_attack()) + if (!foe || foe->is_player() || mons->wont_attack()) { // Animals only look at the current player form, smart monsters at the // actual player genus. @@ -541,7 +541,7 @@ bool mons_speaks(monster* mons) const bool no_foe = (foe == NULL); const bool no_player = crawl_state.game_is_arena() || (!mons->wont_attack() - && (!foe || foe->atype() != ACT_PLAYER)); + && (!foe || !foe->is_player())); const bool mon_foe = (m_foe != NULL); const bool no_god = no_foe || (mon_foe && foe->deity() == GOD_NO_GOD); const bool named_foe = !no_foe && (!mon_foe || (m_foe->is_named() |