summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/view.cc
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-11-13 12:15:09 +0100
committerRobert Vollmert <rvollmert@gmx.net>2009-11-13 13:06:24 +0100
commitaffe43ff3d51dfd9ae8c87021ace90e7964d74cf (patch)
tree996e13146afd31bfb4a75465b71ab785fc331cc1 /crawl-ref/source/view.cc
parent50bd79855e3468f29bc3d9d699065de9f64c3bd8 (diff)
downloadcrawl-ref-affe43ff3d51dfd9ae8c87021ace90e7964d74cf.tar.gz
crawl-ref-affe43ff3d51dfd9ae8c87021ace90e7964d74cf.zip
Clean up colour munging.
With the previous change to unseen cells, the check against buffy[bufcount] is not needed anymore, so we no longer need to fill buffy for the tiles build.
Diffstat (limited to 'crawl-ref/source/view.cc')
-rw-r--r--crawl-ref/source/view.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 156e0401ad..a2703490d5 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -952,19 +952,19 @@ void viewwindow(bool do_updates)
DRAW(los_backup);
// Alter colour if flashing the characters vision.
- if (flash_colour && buffy[bufcount])
+ if (flash_colour)
{
- buffy[bufcount + 1] =
- observe_cell(gc) ? real_colour(flash_colour)
- : DARKGREY;
+ buffy[bufcount + 1] = observe_cell(gc) ? real_colour(flash_colour)
+ : DARKGREY;
}
- else if (Options.target_range > 0 && buffy[bufcount]
- && (grid_distance(you.pos(), gc) > Options.target_range
- || !observe_cell(gc)))
+ else
{
- buffy[bufcount + 1] = DARKGREY;
+ bool out_of_range = Options.target_range > 0
+ && (grid_distance(you.pos(), gc) > Options.target_range);
+ if (!observe_cell(gc) || out_of_range)
+ buffy[bufcount + 1] = DARKGREY;
#ifdef USE_TILE
- if (observe_cell(gc))
+ if (out_of_range)
tileb[bufcount + 1] |= TILE_FLAG_OOR;
#endif
}