Move redraw functions from stuff.cc -> output.cc

40 files changed, 99 insertions, 63 deletions

diff --git a/crawl-ref/source/acquire.cc b/crawl-ref/source/acquire.cc
index 6a01ba82a8..7b62756cf4 100644
--- a/crawl-ref/source/acquire.cc
+++ b/crawl-ref/source/acquire.cc
@@ -30,6 +30,7 @@
 #include "macro.h"
 #include "makeitem.h"
 #include "message.h"
+#include "output.h"
 #include "player.h"
 #include "random.h"
 #include "random-weight.h"
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 50afa88f69..34f05d88e6 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -36,6 +36,7 @@
 #include "message.h"
 #include "mon-util.h"
 #include "ouch.h"
+#include "output.h"
 #include "player.h"
 #include "prompt.h"
 #include "religion.h"
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 135a0c3d16..b3577466e0 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -48,6 +48,7 @@
 #include "notes.h"
 #include "options.h"
 #include "ouch.h"
+#include "output.h"
 #include "player.h"
 #include "player-equip.h"
 #include "player-stats.h"
diff --git a/crawl-ref/source/dgn-overview.cc b/crawl-ref/source/dgn-overview.cc
index a16f72f7a5..1ae7c6ebfd 100644
--- a/crawl-ref/source/dgn-overview.cc
+++ b/crawl-ref/source/dgn-overview.cc
@@ -25,6 +25,7 @@
 #include "libutil.h"
 #include "menu.h"
 #include "message.h"
+#include "output.h"
 #include "prompt.h"
 #include "religion.h"
 #include "shopping.h"
diff --git a/crawl-ref/source/godabil.cc b/crawl-ref/source/godabil.cc
index 28e097b8e2..3b7cc8bf11 100644
--- a/crawl-ref/source/godabil.cc
+++ b/crawl-ref/source/godabil.cc
@@ -54,6 +54,7 @@
 #include "mutation.h"
 #include "notes.h"
 #include "ouch.h"
+#include "output.h"
 #include "place.h"
 #include "player-stats.h"
 #include "potion.h"
diff --git a/crawl-ref/source/hints.cc b/crawl-ref/source/hints.cc
index 5b5d4a5435..efb48c32d6 100644
--- a/crawl-ref/source/hints.cc
+++ b/crawl-ref/source/hints.cc
@@ -39,6 +39,7 @@
 #include "mutation.h"
 #include "options.h"
 #include "ouch.h"
+#include "output.h"
 #include "jobs.h"
 #include "player.h"
 #include "random.h"
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc
index b17f5704fc..3e0ac85935 100644
--- a/crawl-ref/source/invent.cc
+++ b/crawl-ref/source/invent.cc
@@ -31,6 +31,7 @@
 #include "libutil.h"
 #include "macro.h"
 #include "message.h"
+#include "output.h"
 #include "player.h"
 #include "prompt.h"
 #include "religion.h"
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 223204ed0c..ce08f42c1a 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -41,6 +41,7 @@
 #include "mon-place.h"
 #include "mutation.h"
 #include "options.h"
+#include "output.h"
 #include "player-equip.h"
 #include "player-stats.h"
 #include "potion.h"
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 53d468f4f4..3207dd39b3 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -32,6 +32,7 @@
 #include "makeitem.h"
 #include "mon-util.h"
 #include "notes.h"
+#include "output.h"
 #include "player.h"
 #include "prompt.h"
 #include "religion.h"
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 70adf6f1fe..1122470135 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -53,6 +53,7 @@
 #include "notes.h"
 #include "options.h"
 #include "orb.h"
+#include "output.h"
 #include "place.h"
 #include "player.h"
 #include "player-equip.h"
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc
index 75d25d6ab5..ad9eea2c92 100644
--- a/crawl-ref/source/macro.cc
+++ b/crawl-ref/source/macro.cc
@@ -38,6 +38,7 @@
 #include "files.h"
 #include "libutil.h"
 #include "options.h"
+#include "output.h"
 #include "message.h"
 #include "state.h"
 #include "stuff.h"
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index fb8bbd6509..2cfef92a0e 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -41,6 +41,7 @@
 #include "mon-util.h"
 #include "notes.h"
 #include "ouch.h"
+#include "output.h"
 #include "player.h"
 #include "player-stats.h"
 #include "religion.h"
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc
index c19be8979d..f5b387344d 100644
--- a/crawl-ref/source/ouch.cc
+++ b/crawl-ref/source/ouch.cc
@@ -55,6 +55,7 @@
 #include "mon-place.h"
 #include "mutation.h"
 #include "notes.h"
+#include "output.h"
 #include "player.h"
 #include "player-stats.h"
 #include "potion.h"
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 9441244d4f..e7011eff87 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -32,6 +32,7 @@
 #include "itemname.h"
 #include "itemprop.h"
 #include "items.h"
+#include "jobs.h"
 #include "lang-fake.h"
 #include "libutil.h"
 #include "menu.h"
@@ -40,7 +41,7 @@
 #include "mon-info.h"
 #include "mon-util.h"
 #include "mutation.h"
-#include "jobs.h"
+#include "notes.h"
 #include "ouch.h"
 #include "player.h"
 #include "prompt.h"
@@ -52,6 +53,7 @@
 #include "throw.h"
 #include "transform.h"
 #include "travel.h"
+#include "view.h"
 #include "viewchar.h"
 #include "viewgeom.h"
 #include "showsymb.h"
@@ -1504,6 +1506,62 @@ void draw_border()
     // Line 8 is exp pool, Level
 }
 
+void set_redraw_status(uint64_t flags)
+{
+    you.redraw_status_flags |= flags;
+}
+
+void redraw_screen()
+{
+    if (!crawl_state.need_save)
+    {
+        // If the game hasn't started, don't do much.
+        clrscr();
+        return;
+    }
+
+#ifdef USE_TILE_WEB
+    tiles.close_all_menus();
+#endif
+
+    draw_border();
+
+    you.redraw_title        = true;
+    you.redraw_hit_points   = true;
+    you.redraw_magic_points = true;
+#if TAG_MAJOR_VERSION == 34
+    if (you.species == SP_LAVA_ORC)
+        you.redraw_temperature = true;
+#endif
+    you.redraw_stats.init(true);
+    you.redraw_armour_class = true;
+    you.redraw_evasion      = true;
+    you.redraw_experience   = true;
+    you.wield_change        = true;
+    you.redraw_quiver       = true;
+
+    set_redraw_status(
+                      REDRAW_LINE_1_MASK | REDRAW_LINE_2_MASK | REDRAW_LINE_3_MASK);
+
+    print_stats();
+
+    bool note_status = notes_are_active();
+    activate_notes(false);
+    print_stats_level();
+#ifdef DGL_SIMPLE_MESSAGING
+    update_message_status();
+#endif
+    update_turn_count();
+    activate_notes(note_status);
+
+    viewwindow();
+
+    // Display the message window at the end because it places
+    // the cursor behind possible prompts.
+    display_message_window();
+    update_screen();
+}
+
 // ----------------------------------------------------------------------
 // Monster pane
 // ----------------------------------------------------------------------
diff --git a/crawl-ref/source/output.h b/crawl-ref/source/output.h
index 8ee7a490b4..5b2d99d829 100644
--- a/crawl-ref/source/output.h
+++ b/crawl-ref/source/output.h
@@ -40,6 +40,10 @@ void print_stats();
 void print_stats_level();
 void draw_border();
 
+void set_redraw_status(uint64_t flags);
+
+void redraw_screen();
+
 string mpr_monster_list(bool past = false);
 int update_monster_pane();
 
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 574dbe1202..3186d02078 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -63,6 +63,7 @@
 #include "notes.h"
 #include "options.h"
 #include "ouch.h"
+#include "output.h"
 #include "player.h"
 #include "player-stats.h"
 #include "prompt.h"
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index 24cb8672eb..8d8cc2e7f5 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -29,6 +29,7 @@
 #include "macro.h"
 #include "menu.h"
 #include "notes.h"
+#include "output.h"
 #include "place.h"
 #include "player.h"
 #include "prompt.h"
diff --git a/crawl-ref/source/skill_menu.cc b/crawl-ref/source/skill_menu.cc
index 2a96caa860..37d898c141 100644
--- a/crawl-ref/source/skill_menu.cc
+++ b/crawl-ref/source/skill_menu.cc
@@ -16,6 +16,7 @@
 #include "hints.h"
 #include "libutil.h"
 #include "options.h"
+#include "output.h"
 #include "player.h"
 #include "religion.h"
 #include "skills.h"
diff --git a/crawl-ref/source/skills.cc b/crawl-ref/source/skills.cc
index 43e1b9f415..775de769fb 100644
--- a/crawl-ref/source/skills.cc
+++ b/crawl-ref/source/skills.cc
@@ -24,6 +24,7 @@
 #include "message.h"
 #include "misc.h"
 #include "notes.h"
+#include "output.h"
 #include "player.h"
 #include "random.h"
 #include "random-weight.h"
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 70cd1e017a..64851b6702 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -36,6 +36,7 @@
 #include "macro.h"
 #include "message.h"
 #include "options.h"
+#include "output.h"
 #include "player.h"
 #include "prompt.h"
 #include "religion.h"
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 0bed346bed..16582f8d3b 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -41,6 +41,7 @@
 #include "mon-util.h"
 #include "mutation.h"
 #include "ouch.h"
+#include "output.h"
 #include "player.h"
 #include "prompt.h"
 #include "religion.h"
diff --git a/crawl-ref/source/spl-selfench.cc b/crawl-ref/source/spl-selfench.cc
index 23358e8e02..d6f438a6a2 100644
--- a/crawl-ref/source/spl-selfench.cc
+++ b/crawl-ref/source/spl-selfench.cc
@@ -18,6 +18,7 @@
 #include "message.h"
 #include "misc.h"
 #include "options.h"
+#include "output.h"
 #include "religion.h"
 #include "spl-cast.h"
 #include "spl-transloc.h"
diff --git a/crawl-ref/source/spl-transloc.cc b/crawl-ref/source/spl-transloc.cc
index 0441b8697b..4beb9735cb 100644
--- a/crawl-ref/source/spl-transloc.cc
+++ b/crawl-ref/source/spl-transloc.cc
@@ -33,6 +33,7 @@
 #include "mon-behv.h"
 #include "mon-util.h"
 #include "orb.h"
+#include "output.h"
 #include "prompt.h"
 #include "random.h"
 #include "shout.h"
diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc
index a9faabaf8a..7b775df6f8 100644
--- a/crawl-ref/source/spl-util.cc
+++ b/crawl-ref/source/spl-util.cc
@@ -32,6 +32,7 @@
 #include "mon-util.h"
 #include "notes.h"
 #include "options.h"
+#include "output.h"
 #include "player.h"
 #include "prompt.h"
 #include "religion.h"
diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc
index b45389e691..8c531c90b7 100644
--- a/crawl-ref/source/stash.cc
+++ b/crawl-ref/source/stash.cc
@@ -27,6 +27,7 @@
 #include "message.h"
 #include "mon-util.h"
 #include "notes.h"
+#include "output.h"
 #include "place.h"
 #include "religion.h"
 #include "shopping.h"
diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc
index 9dac247e5f..11ea386d7a 100644
--- a/crawl-ref/source/stuff.cc
+++ b/crawl-ref/source/stuff.cc
@@ -88,62 +88,6 @@ string make_file_time(time_t when)
     return "";
 }
 
-void set_redraw_status(uint64_t flags)
-{
-    you.redraw_status_flags |= flags;
-}
-
-void redraw_screen()
-{
-    if (!crawl_state.need_save)
-    {
-        // If the game hasn't started, don't do much.
-        clrscr();
-        return;
-    }
-
-#ifdef USE_TILE_WEB
-    tiles.close_all_menus();
-#endif
-
-    draw_border();
-
-    you.redraw_title        = true;
-    you.redraw_hit_points   = true;
-    you.redraw_magic_points = true;
-#if TAG_MAJOR_VERSION == 34
-    if (you.species == SP_LAVA_ORC)
-        you.redraw_temperature = true;
-#endif
-    you.redraw_stats.init(true);
-    you.redraw_armour_class = true;
-    you.redraw_evasion      = true;
-    you.redraw_experience   = true;
-    you.wield_change        = true;
-    you.redraw_quiver       = true;
-
-    set_redraw_status(
-        REDRAW_LINE_1_MASK | REDRAW_LINE_2_MASK | REDRAW_LINE_3_MASK);
-
-    print_stats();
-
-    bool note_status = notes_are_active();
-    activate_notes(false);
-    print_stats_level();
-#ifdef DGL_SIMPLE_MESSAGING
-    update_message_status();
-#endif
-    update_turn_count();
-    activate_notes(note_status);
-
-    viewwindow();
-
-    // Display the message window at the end because it places
-    // the cursor behind possible prompts.
-    display_message_window();
-    update_screen();
-}
-
 double stepdown(double value, double step)
 {
     return step * log2(1 + value / step);
diff --git a/crawl-ref/source/stuff.h b/crawl-ref/source/stuff.h
index bb4433bda2..998cfdf780 100644
--- a/crawl-ref/source/stuff.h
+++ b/crawl-ref/source/stuff.h
@@ -14,12 +14,6 @@
 string make_time_string(time_t abs_time, bool terse = false);
 string make_file_time(time_t when);
 
-// redraw
-
-void set_redraw_status(uint64_t flags);
-
-void redraw_screen();
-
 // stepdowns
 
 enum rounding_type
diff --git a/crawl-ref/source/throw.cc b/crawl-ref/source/throw.cc
index bcee531b6a..6be3f52e0b 100644
--- a/crawl-ref/source/throw.cc
+++ b/crawl-ref/source/throw.cc
@@ -34,6 +34,7 @@
 #include "mon-behv.h"
 #include "mutation.h"
 #include "options.h"
+#include "output.h"
 #include "prompt.h"
 #include "religion.h"
 #include "rot.h"
diff --git a/crawl-ref/source/tilereg-abl.cc b/crawl-ref/source/tilereg-abl.cc
index 8fdfbbee01..c69d741f41 100644
--- a/crawl-ref/source/tilereg-abl.cc
+++ b/crawl-ref/source/tilereg-abl.cc
@@ -10,6 +10,7 @@
 #include "libutil.h"
 #include "macro.h"
 #include "message.h"
+#include "output.h"
 #include "stuff.h"
 #include "tiledef-dngn.h"
 #include "tiledef-icons.h"
diff --git a/crawl-ref/source/tilereg-dgn.cc b/crawl-ref/source/tilereg-dgn.cc
index bdf845b7e4..bf2dc4e004 100644
--- a/crawl-ref/source/tilereg-dgn.cc
+++ b/crawl-ref/source/tilereg-dgn.cc
@@ -21,6 +21,7 @@
 #include "misc.h"
 #include "mon-util.h"
 #include "options.h"
+#include "output.h"
 #include "prompt.h"
 #include "religion.h"
 #include "spl-cast.h"
diff --git a/crawl-ref/source/tilereg-inv.cc b/crawl-ref/source/tilereg-inv.cc
index d34c279cb4..49a8d3f341 100644
--- a/crawl-ref/source/tilereg-inv.cc
+++ b/crawl-ref/source/tilereg-inv.cc
@@ -20,6 +20,7 @@
 #include "misc.h"
 #include "mon-util.h"
 #include "options.h"
+#include "output.h"
 #include "spl-book.h"
 #include "stuff.h"
 #include "tiledef-dngn.h"
diff --git a/crawl-ref/source/tilereg-mem.cc b/crawl-ref/source/tilereg-mem.cc
index 55fc4cee79..b6e0e27111 100644
--- a/crawl-ref/source/tilereg-mem.cc
+++ b/crawl-ref/source/tilereg-mem.cc
@@ -8,6 +8,7 @@
 #include "describe.h"
 #include "libutil.h"
 #include "macro.h"
+#include "output.h"
 #include "religion.h"
 #include "spl-book.h"
 #include "spl-cast.h"
diff --git a/crawl-ref/source/tilereg-mon.cc b/crawl-ref/source/tilereg-mon.cc
index 0832f54754..bb6ce58fe5 100644
--- a/crawl-ref/source/tilereg-mon.cc
+++ b/crawl-ref/source/tilereg-mon.cc
@@ -11,6 +11,7 @@
 #include "env.h"
 #include "libutil.h"
 #include "monster.h"
+#include "output.h"
 #include "stuff.h"
 #include "tiledef-dngn.h"
 #include "tiledef-icons.h"
diff --git a/crawl-ref/source/tilereg-skl.cc b/crawl-ref/source/tilereg-skl.cc
index 51ed67cf1d..23a81a217c 100644
--- a/crawl-ref/source/tilereg-skl.cc
+++ b/crawl-ref/source/tilereg-skl.cc
@@ -8,6 +8,7 @@
 #include "cio.h"
 #include "libutil.h"
 #include "options.h"
+#include "output.h"
 #include "skills.h"
 #include "skills2.h"
 #include "stuff.h"
diff --git a/crawl-ref/source/tilereg-spl.cc b/crawl-ref/source/tilereg-spl.cc
index 168963dfa4..9843314b75 100644
--- a/crawl-ref/source/tilereg-spl.cc
+++ b/crawl-ref/source/tilereg-spl.cc
@@ -9,6 +9,7 @@
 #include "libutil.h"
 #include "macro.h"
 #include "message.h"
+#include "output.h"
 #include "prompt.h"
 #include "spl-cast.h"
 #include "spl-util.h"
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index ffdd24ff0a..da3cc87b83 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -40,6 +40,7 @@
 #include "mon-transit.h"
 #include "mon-util.h"
 #include "ouch.h"
+#include "output.h"
 #include "player.h"
 #include "prompt.h"
 #include "religion.h"
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index 6c03136b56..b1079b1dd6 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -40,6 +40,7 @@
 #include "mon-death.h"
 #include "mon-util.h"
 #include "options.h"
+#include "output.h"
 #include "place.h"
 #include "player.h"
 #include "prompt.h"
diff --git a/crawl-ref/source/viewmap.cc b/crawl-ref/source/viewmap.cc
index 0d6132e292..9b0a6a99cd 100644
--- a/crawl-ref/source/viewmap.cc
+++ b/crawl-ref/source/viewmap.cc
@@ -28,6 +28,7 @@
 #include "macro.h"
 #include "mon-util.h"
 #include "options.h"
+#include "output.h"
 #include "place.h"
 #include "player.h"
 #include "showsymb.h"
diff --git a/crawl-ref/source/wiz-fsim.cc b/crawl-ref/source/wiz-fsim.cc
index f0e1bce236..ce578890cd 100644
--- a/crawl-ref/source/wiz-fsim.cc
+++ b/crawl-ref/source/wiz-fsim.cc
@@ -29,6 +29,7 @@
 #include "mon-death.h"
 #include "mon-util.h"
 #include "options.h"
+#include "output.h"
 #include "player.h"
 #include "player-equip.h"
 #include "ranged_attack.h"
diff --git a/crawl-ref/source/wiz-you.cc b/crawl-ref/source/wiz-you.cc
index c9215a74cb..1b61237815 100644
--- a/crawl-ref/source/wiz-you.cc
+++ b/crawl-ref/source/wiz-you.cc
@@ -21,6 +21,7 @@
 #include "mutation.h"
 #include "newgame.h"
 #include "ng-setup.h"
+#include "output.h"
 #include "player.h"
 #include "prompt.h"
 #include "religion.h"