diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-06 13:37:03 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-06 13:37:52 -0600 |
| commit | f858cfc60235a5cfb86dd2a2c510dde5e130a4bf (patch) | |
| tree | d961eaf5b7122e52a9250e3381d93b1e9c80c88b /crawl-ref/source/mon-info.cc | |
| parent | 79d8c3044d2bb75d7f1e8ebad5cf6e3692fb7605 (diff) | |
| download | crawl-ref-f858cfc60235a5cfb86dd2a2c510dde5e130a4bf.tar.gz crawl-ref-f858cfc60235a5cfb86dd2a2c510dde5e130a4bf.zip | |
Move checks for the berserk state into actor::berserk().
Diffstat (limited to 'crawl-ref/source/mon-info.cc')
| -rw-r--r-- | crawl-ref/source/mon-info.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/mon-info.cc b/crawl-ref/source/mon-info.cc index 47a2f8564c..141584a003 100644 --- a/crawl-ref/source/mon-info.cc +++ b/crawl-ref/source/mon-info.cc @@ -46,7 +46,7 @@ monster_info::monster_info(const monsters *m) if (mons_looks_stabbable(m)) m_brands |= (1 << MB_STABBABLE); if (mons_looks_distracted(m)) m_brands |= (1 << MB_DISTRACTED); - if (m->has_ench(ENCH_BERSERK)) m_brands |= (1 << MB_BERSERK); + if (m->berserk()) m_brands |= (1 << MB_BERSERK); get_mons_glyph(m_mon, &m_glyph, &m_glyph_colour); @@ -255,7 +255,7 @@ void monster_info::to_string(int count, std::string& desc, if (count == 1) { - if (m_mon->has_ench(ENCH_BERSERK)) + if (m_mon->berserk()) out << " (berserk)"; else if (Options.verbose_monster_pane) out << _verbose_info(m_mon); |