diff options
| -rw-r--r-- | crawl-ref/source/misc.cc | 10 | ||||
| -rw-r--r-- | crawl-ref/source/output.cc | 21 |
2 files changed, 7 insertions, 24 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 542a912c17..65af62fd85 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -1499,10 +1499,6 @@ void up_stairs(dungeon_feature_type force_stair, level_id old_level_id = level_id::current(); LevelInfo &old_level_info = travel_cache.get_level_info(old_level_id); - // Does the next level have a warning annotation? -// if (!force_stair && !check_annotation_exclusion_warning()) -// return; - // Since the overloaded message set turn_is_over, I'm assuming that // the overloaded character makes an attempt... so we're doing this // check before that one. -- bwr @@ -1814,10 +1810,6 @@ void down_stairs( int old_level, dungeon_feature_type force_stair, mpr("You fall through a shaft!"); } - // Does the next level have a warning annotation? -// if (!force_stair && !check_annotation_exclusion_warning()) -// return; - // All checks are done, the player is on the move now. // Fire level-leaving trigger. @@ -1830,7 +1822,7 @@ void down_stairs( int old_level, dungeon_feature_type force_stair, // reaching the Abyss. if (grd[you.x_pos][you.y_pos] == DNGN_ENTER_ABYSS) mark_milestone("abyss.enter", "entered the Abyss!"); - else if (grd[you.x_pos][you.y_pos] == DNGN_EXIT_ABYSS) + else if (grd[you.x_pos][you.y_pos] == DNGN_EXIT_ABYSS)Picture mark_milestone("abyss.exit", "escaped from the Abyss!"); } #endif diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index fa1b681c57..c44a882701 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -77,12 +77,13 @@ class colour_bar m_old_disp(-1), m_request_redraw_after(0) { - // m_old_disp < 0 means it's invalid and needs to be initialized + // m_old_disp < 0 means it's invalid and needs to be initialized. } bool wants_redraw() const { - return (m_request_redraw_after && you.num_turns >= m_request_redraw_after); + return (m_request_redraw_after + && you.num_turns >= m_request_redraw_after); } void draw(int ox, int oy, int val, int max_val) @@ -94,16 +95,6 @@ class colour_bar return; } -#ifdef USE_TILE - // Don't redraw colour bars while resting - // *unless* we'll stop doing so right after that - if (you.running >= 2 && is_resting() && val != max_val) - { - m_old_disp = -1; - return; - } -#endif - const int width = crawl_view.hudsz.x - (ox-1); const int disp = width * val / max_val; const int old_disp = (m_old_disp < 0) ? disp : m_old_disp; @@ -115,7 +106,7 @@ class colour_bar for (int cx = 0; cx < width; cx++) { #ifdef USE_TILE - // maybe this should use textbackground too? + // Maybe this should use textbackground too? textcolor(BLACK + m_empty * 16); if (cx < disp) @@ -129,12 +120,12 @@ class colour_bar textcolor(m_default); putch('='); } - else if (/* old_disp <= cx && */ cx < disp) + else if (cx < disp) { textcolor(m_change_pos); putch('='); } - else if (/* disp <= cx && */ cx < old_disp) + else if (cx < old_disp) { textcolor(m_change_neg); putch('-'); |