summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/view.cc
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-11-13 13:28:50 +0100
committerRobert Vollmert <rvollmert@gmx.net>2009-11-13 13:28:50 +0100
commit32f4bcec244dd43963daf60fa8f8233ad11b1aeb (patch)
tree23f62edff7c125dd6db8b8b37ad2b9053582c7cf /crawl-ref/source/view.cc
parent79a08c38a64269fa3bcd0f175b8add71538d24a7 (diff)
downloadcrawl-ref-32f4bcec244dd43963daf60fa8f8233ad11b1aeb.tar.gz
crawl-ref-32f4bcec244dd43963daf60fa8f8233ad11b1aeb.zip
Revert "Move arena check to draw_player."
This reverts commit 3da2a539cae5cd1838f45b598355ab58d039fa6b. Was causing player position not be updated at all in arena.
Diffstat (limited to 'crawl-ref/source/view.cc')
-rw-r--r--crawl-ref/source/view.cc7
1 files 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