diff options
author | Robert Vollmert <rvollmert@gmx.net> | 2009-11-16 21:16:11 +0100 |
---|---|---|
committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-16 21:22:10 +0100 |
commit | 44e7c9eb4c8ff258530794486c618520af14d279 (patch) | |
tree | b3f31cf49681f613991a03ecbd63710f45c54e98 /crawl-ref | |
parent | 4d1aa77622fdaf6ae8c985ee42c41dce96278ccc (diff) | |
download | crawl-ref-44e7c9eb4c8ff258530794486c618520af14d279.tar.gz crawl-ref-44e7c9eb4c8ff258530794486c618520af14d279.zip |
Move running short-circuit earlier in viewwindow (tiles).
Tiles main viewwindow loop now doesn't have side-effects either.
Also unify the short-circuit checks: Console version also skips
redrawing when resting.
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/view.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 42877990dc..ad306499a5 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -853,10 +853,9 @@ void viewwindow(bool monster_updates, bool show_updates) bool run_dont_draw = you.running && Options.travel_delay < 0 && (!you.running.is_explore() || Options.explore_delay < 0); -#ifndef USE_TILE - if (run_dont_draw || you.asleep()) + + if (run_dont_draw || you.asleep() || is_resting()) return; -#endif cursor_control cs(false); @@ -914,11 +913,6 @@ void viewwindow(bool monster_updates, bool show_updates) // and this simply works without requiring a stack. you.flash_colour = BLACK; -#ifdef USE_TILE - if (run_dont_draw || you.asleep() || is_resting()) - return; -#endif - #ifndef USE_TILE you.last_view_update = you.num_turns; puttext(crawl_view.viewp.x, crawl_view.viewp.y, |