diff options
| author | Vsevolod Kozlov <zaba@thorium.homeunix.org> | 2009-11-09 14:33:06 +0300 |
|---|---|---|
| committer | Vsevolod Kozlov <zaba@thorium.homeunix.org> | 2009-11-09 14:58:19 +0300 |
| commit | 9338556ebf846bbc4176134e3846ef6699e8434b (patch) | |
| tree | 2107949166730a765e3e1e98a66778f112fb5e6a /crawl-ref/source/monspeak.cc | |
| parent | bf03515e22d610f81afa6d4153afc383f7331363 (diff) | |
| download | crawl-ref-9338556ebf846bbc4176134e3846ef6699e8434b.tar.gz crawl-ref-9338556ebf846bbc4176134e3846ef6699e8434b.zip | |
Replace mons_wont_attack with monsters::wont_attack.
Diffstat (limited to 'crawl-ref/source/monspeak.cc')
| -rw-r--r-- | crawl-ref/source/monspeak.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/monspeak.cc b/crawl-ref/source/monspeak.cc index ef0547010a..3241200ae1 100644 --- a/crawl-ref/source/monspeak.cc +++ b/crawl-ref/source/monspeak.cc @@ -430,7 +430,7 @@ bool mons_speaks(monsters *monster) if (confused) prefixes.push_back("confused"); - const actor* foe = (!crawl_state.arena && mons_wont_attack(monster) + const actor* foe = (!crawl_state.arena && monster->wont_attack() && invalid_monster_index(monster->foe)) ? &you : monster->get_foe(); const monsters* m_foe = (foe && foe->atype() == ACT_MONSTER) ? @@ -494,7 +494,7 @@ bool mons_speaks(monsters *monster) const bool no_foe = (foe == NULL); const bool no_player = crawl_state.arena - || (!mons_wont_attack(monster) + || (!monster->wont_attack() && (!foe || foe->atype() != ACT_PLAYER)); const bool mon_foe = (m_foe != NULL); const bool no_god = no_foe || (mon_foe && foe->deity() == GOD_NO_GOD); |