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/view.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/view.cc')
| -rw-r--r-- | crawl-ref/source/view.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index afa1718677..42877990dc 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -895,9 +895,10 @@ void viewwindow(bool monster_updates, bool show_updates) : DARKGREY; #endif } - else if (Options.target_range > 0) + else if (crawl_state.darken_range >= 0) { - bool out_of_range = grid_distance(you.pos(), gc) > Options.target_range + bool out_of_range = grid_distance(you.pos(), gc) > + crawl_state.darken_range || !you.see_cell(gc); #ifndef USE_TILE if (out_of_range) |