diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-11-05 20:50:54 +0100 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-05 22:30:03 +0100 |
| commit | dc3f573c6ef467ddcc4a837ce90ca9df3b502c2e (patch) | |
| tree | f7915736d0a9bad11d83c3ff8a0263577a27e979 /crawl-ref/source/output.cc | |
| parent | 31124ec682c2b826f169c23e808fa741a3033a04 (diff) | |
| download | crawl-ref-dc3f573c6ef467ddcc4a837ce90ca9df3b502c2e.tar.gz crawl-ref-dc3f573c6ef467ddcc4a837ce90ca9df3b502c2e.zip | |
Unify mesmerisation code.
There were several places that had copies of the same code, checking
whether mesmerisation blocked movement to a given target.
The various mesmerisation functions have become methods of player
and were moved into behold.cc.
Diffstat (limited to 'crawl-ref/source/output.cc')
| -rw-r--r-- | crawl-ref/source/output.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index d5505d48ac..fcc94f0cd7 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -737,7 +737,7 @@ static void _get_status_lights(std::vector<status_light>& out) out.push_back(status_light(RED, "-MR")); // TODO: Differentiate between mermaids and sirens! - if (you.duration[DUR_MESMERISED]) + if (you.beheld()) out.push_back(status_light(RED, "Mesm")); if (you.duration[DUR_LIQUID_FLAMES]) @@ -2056,7 +2056,7 @@ std::string _status_mut_abilities() status.push_back("short of breath"); // TODO: Differentiate between mermaids and sirens! - if (you.duration[DUR_MESMERISED]) + if (you.beheld()) status.push_back("mesmerised"); if (you.duration[DUR_LIQUID_FLAMES]) |