From 32f4bcec244dd43963daf60fa8f8233ad11b1aeb Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Fri, 13 Nov 2009 13:28:50 +0100 Subject: Revert "Move arena check to draw_player." This reverts commit 3da2a539cae5cd1838f45b598355ab58d039fa6b. Was causing player position not be updated at all in arena. --- crawl-ref/source/view.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 0e6b1cf85b..0799b53bd0 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -808,8 +808,6 @@ 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; @@ -935,8 +933,11 @@ 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()) + else if (gc == you.pos() && + !crawl_state.arena && !crawl_state.arena_suspended) + { draw_player(&buffy[bufcount], gc, ep); + } else if (observe_cell(gc)) draw_los(&buffy[bufcount], gc, ep); else -- cgit v1.2.3-54-g00ecf