summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/view.cc
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-11-13 12:49:17 +0100
committerRobert Vollmert <rvollmert@gmx.net>2009-11-13 13:06:25 +0100
commit3da2a539cae5cd1838f45b598355ab58d039fa6b (patch)
tree3a7f376be342c648e5d193d95b857beb0e4ab1a1 /crawl-ref/source/view.cc
parent5a674a9c4d6cbd66d9ab700b11c3d7f8082dd84a (diff)
downloadcrawl-ref-3da2a539cae5cd1838f45b598355ab58d039fa6b.tar.gz
crawl-ref-3da2a539cae5cd1838f45b598355ab58d039fa6b.zip
Move arena check to draw_player.
Diffstat (limited to 'crawl-ref/source/view.cc')
-rw-r--r--crawl-ref/source/view.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index bb60030779..d2e10b1d05 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -808,6 +808,8 @@ static void draw_outside_los(screen_buffer_t* buffy, const coord_def &gc)
static void draw_player(screen_buffer_t* buffy,
const coord_def& gc, const coord_def& ep)
{
+ if (crawl_state.arena || crawl_state.arena_suspended)
+ return;
#ifndef USE_TILE
// Player overrides everything in cell.
buffy[0] = you.symbol;
@@ -926,11 +928,8 @@ void viewwindow(bool do_updates)
draw_unseen(&buffy[bufcount], gc);
else if (!crawl_view.in_grid_los(gc))
draw_outside_los(&buffy[bufcount], gc);
- else if (gc == you.pos() &&
- !crawl_state.arena && !crawl_state.arena_suspended)
- {
+ else if (gc == you.pos())
draw_player(&buffy[bufcount], gc, ep);
- }
else if (observe_cell(gc))
draw_los(&buffy[bufcount], gc, ep);
else