diff options
author | Robert Vollmert <rvollmert@gmx.net> | 2009-11-16 17:48:53 +0100 |
---|---|---|
committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-16 20:32:25 +0100 |
commit | 2c9b3ce286f5c274cb0348253259bcca24d967a3 (patch) | |
tree | e1ac204d887238915b3fd8a2755b66973fd8bc9f /crawl-ref/source/spl-cast.cc | |
parent | 5059f548248efbc905c16a7cfbaa41d98c30dcb0 (diff) | |
download | crawl-ref-2c9b3ce286f5c274cb0348253259bcca24d967a3.tar.gz crawl-ref-2c9b3ce286f5c274cb0348253259bcca24d967a3.zip |
Simplify out-of-range darkening.
Also fixes the range_view_annotator destructor
clobbering option "darken_beyond_range".
Options.target_range is now really an option, and called
Options.darken_beyond_range. Current darkening range is
now stored in crawl_state.darken_range.
I can't reproduce SIGHUP retaining darkened range
(BR 2151183) (why would it be saved?), so
range_view_annotator is not a crawl_exit_hook anymore.
crawl_exit_hook is not used anymore, but still present.
Diffstat (limited to 'crawl-ref/source/spl-cast.cc')
-rw-r--r-- | crawl-ref/source/spl-cast.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 06f4f1771b..812cfdbfe9 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -754,13 +754,13 @@ bool cast_a_spell(bool check_range, spell_type spell) mpr("There are no visible monsters within range! (Use <w>Z</w> to " "cast anyway.)"); - if (Options.target_range != -1) + if (Options.darken_beyond_range) { - Options.target_range = _calc_spell_range(spell); - viewwindow(false); + crawl_state.darken_range = _calc_spell_range(spell); + viewwindow(false, false); delay(500); - Options.target_range = 0; - viewwindow(false); + crawl_state.darken_range = -1; + viewwindow(false, false); } return (false); } |