diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2011-10-15 13:52:24 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2011-11-04 18:49:49 +0100 |
| commit | c346361417241d0e4d7531ed65a1ca5b4f497139 (patch) | |
| tree | 8c76c3b32dac858b2a36df7d032ff50e49545384 /crawl-ref/source/mon-speak.cc | |
| parent | f4a9aed257bbdd264fb1ef43e7b29b3cc599cd65 (diff) | |
| download | crawl-ref-c346361417241d0e4d7531ed65a1ca5b4f497139.tar.gz crawl-ref-c346361417241d0e4d7531ed65a1ca5b4f497139.zip | |
Get rid of level_type, unify BRANCH_*, LEVEL_* and portal vaults.
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 9a823e8d12..b8003c40f6 100644 --- a/crawl-ref/source/mon-speak.cc +++ b/crawl-ref/source/mon-speak.cc @@ -296,7 +296,7 @@ static std::string _get_speak_string(const std::vector<std::string> &prefixes, int duration = 1; if (mons->hit_points <= 0) key += " killed"; - else if ((mons->flags & MF_BANISHED) && you.level_type != LEVEL_ABYSS) + else if ((mons->flags & MF_BANISHED) && you.where_are_you != BRANCH_ABYSS) key += " banished"; else if (mons->is_summoned(&duration) && duration <= 0) key += " unsummoned"; @@ -397,7 +397,7 @@ bool mons_speaks(monster* mons) // Monsters always talk on death, even if invisible/silenced/etc. int duration = 1; const bool force_speak = !mons->alive() - || (mons->flags & MF_BANISHED) && you.level_type != LEVEL_ABYSS + || (mons->flags & MF_BANISHED) && you.where_are_you != BRANCH_ABYSS || (mons->is_summoned(&duration) && duration <= 0) || crawl_state.prev_cmd == CMD_LOOK_AROUND; // Wizard testing |