From 3da2a539cae5cd1838f45b598355ab58d039fa6b Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Fri, 13 Nov 2009 12:49:17 +0100 Subject: Move arena check to draw_player. --- crawl-ref/source/view.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/view.cc') 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 -- cgit v1.2.3-54-g00ecf