Fix 1999363: Vampire eating issues.

Tidy up the new lines item descriptions a bit, so you don't get three
free lines in some cases (non-randart, non-special description items)
and one or two in other cases.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6370 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 9 insertions, 7 deletions

diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 0e88083723..6ab46233b2 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -768,8 +768,9 @@ static void _print_status_lights(int y)
     size_t i_light = 0;
     while (true)
     {
-        const int end_x = (wherex() - crawl_view.hudp.x) +
-            (i_light < lights.size() ? strlen(lights[i_light].text) : 10000);
+        const int end_x = (wherex() - crawl_view.hudp.x)
+                + (i_light < lights.size() ? strlen(lights[i_light].text)
+                                           : 10000);
 
         if (end_x <= crawl_view.hudsz.x)
         {
@@ -777,12 +778,12 @@ static void _print_status_lights(int y)
             cprintf("%s", lights[i_light].text);
             if (end_x < crawl_view.hudsz.x)
                 cprintf(" ");
-            ++ i_light;
+            ++i_light;
         }
         else
         {
             clear_to_end_of_line();
-            ++ line_cur;
+            ++line_cur;
             // Careful not to trip the )#(*$ cgotoxy ASSERT
             if (line_cur == line_end)
                 break;
@@ -804,14 +805,15 @@ void print_stats(void)
     if (you.redraw_dexterity)
         you.redraw_evasion = true;
 
-    if (HP_Bar.wants_redraw()) you.redraw_hit_points = true;
-    if (MP_Bar.wants_redraw()) you.redraw_magic_points = true;
+    if (HP_Bar.wants_redraw())
+        you.redraw_hit_points = true;
+    if (MP_Bar.wants_redraw())
+        you.redraw_magic_points = true;
 
     if (you.redraw_hit_points)   { you.redraw_hit_points = false;   _print_stats_hp ( 1, 3); }
     if (you.redraw_magic_points) { you.redraw_magic_points = false; _print_stats_mp ( 1, 4); }
     if (you.redraw_armour_class) { you.redraw_armour_class = false; _print_stats_ac ( 1, 5); }
     if (you.redraw_evasion)      { you.redraw_evasion = false;      _print_stats_ev ( 1, 6); }
-    // (you.redraw_armour_class) { you.redraw_armour_class = false; _print_stats_sh ( 1, 7); }
 
     if (you.redraw_strength)     { you.redraw_strength = false;     _print_stats_str(19, 5); }
     if (you.redraw_intelligence) { you.redraw_intelligence = false; _print_stats_int(19, 6); }