diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-12 16:19:55 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-12 16:19:55 +0000 |
| commit | 32db69fe90588c638f34feaed60c1ea4de9ba214 (patch) | |
| tree | 4b5fb2cc462fbf2a9a750fc3d1108eec1669ffaf /crawl-ref/source/monspeak.cc | |
| parent | c8e3a829389f387b3c54ea512cbe2e9e7a81c546 (diff) | |
| download | crawl-ref-32db69fe90588c638f34feaed60c1ea4de9ba214.tar.gz crawl-ref-32db69fe90588c638f34feaed60c1ea4de9ba214.zip | |
Apply my previous commit to trunk: plants/fungi not triggering conducts.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10190 c06c8d41-db1a-0410-9941-cceddc491573
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 07e284fd19..9420156c25 100644 --- a/crawl-ref/source/monspeak.cc +++ b/crawl-ref/source/monspeak.cc @@ -502,11 +502,11 @@ bool mons_speaks(monsters *monster) } #endif - const bool no_foe = foe == NULL; + const bool no_foe = (foe == NULL); const bool no_player = crawl_state.arena || (!mons_wont_attack(monster) && (!foe || foe->atype() != ACT_PLAYER)); - const bool mon_foe = m_foe != NULL; + 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() |