Move tile_draw_floor into view.cc.

It seems like it should be merged with some of the other code
there.

3 files changed, 28 insertions, 29 deletions

diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 38161a3bf6..6259f79069 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -4532,34 +4532,6 @@ void tile_floor_halo(dungeon_feature_type target, int tile)
         }
 }
 
-// Called from view.cc.
-void tile_draw_floor()
-{
-    for (int cy = 0; cy < env.tile_fg.height(); cy++)
-        for (int cx = 0; cx < env.tile_fg.width(); cx++)
-        {
-            const coord_def ep(cx, cy);
-            const coord_def gc = show2grid(ep);
-
-            int bg = TILE_DNGN_UNSEEN | tile_unseen_flag(gc);
-
-            if (in_bounds(gc) && you.see_cell(gc))
-            {
-                dungeon_feature_type feat = grid_appearance(gc);
-                bg = tileidx_feature(feat, gc.x, gc.y);
-
-                if (feat == DNGN_DETECTED_SECRET_DOOR)
-                     bg |= TILE_FLAG_WAS_SECRET;
-                else if (is_unknown_stair(gc))
-                     bg |= TILE_FLAG_NEW_STAIR;
-            }
-
-            // init tiles
-            env.tile_bg[ep.x][ep.y] = bg;
-            env.tile_fg[ep.x][ep.y] = 0;
-        }
-}
-
 // Called from item() in view.cc
 void tile_place_item(int x, int y, int idx)
 {
diff --git a/crawl-ref/source/tiles.h b/crawl-ref/source/tiles.h
index 9c3cf7d8ce..b378e54184 100644
--- a/crawl-ref/source/tiles.h
+++ b/crawl-ref/source/tiles.h
@@ -72,7 +72,6 @@ int tilep_equ_gloves(const item_def &item);
 int tilep_equ_boots(const item_def &item);
 
 // Tile display related
-void tile_draw_floor();
 void tile_place_monster(int gx, int gy, int idx, bool foreground = true,
                         bool detected = false);
 void tile_place_item(int x, int y, int idx);
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index c11a309c6d..d5802c06a3 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -725,6 +725,34 @@ static void player_view_update()
     update_exclusion_los(update_excludes);
 }
 
+void tile_draw_floor()
+{
+    for (int cy = 0; cy < env.tile_fg.height(); cy++)
+        for (int cx = 0; cx < env.tile_fg.width(); cx++)
+        {
+            const coord_def ep(cx, cy);
+            const coord_def gc = show2grid(ep);
+
+            int bg = TILE_DNGN_UNSEEN | tile_unseen_flag(gc);
+
+            if (in_bounds(gc) && you.see_cell(gc))
+            {
+                dungeon_feature_type feat = grid_appearance(gc);
+                bg = tileidx_feature(feat, gc.x, gc.y);
+
+                if (feat == DNGN_DETECTED_SECRET_DOOR)
+                     bg |= TILE_FLAG_WAS_SECRET;
+                else if (is_unknown_stair(gc))
+                     bg |= TILE_FLAG_NEW_STAIR;
+            }
+
+
+            // init tiles
+            env.tile_bg[ep.x][ep.y] = bg;
+            env.tile_fg[ep.x][ep.y] = 0;
+        }
+}
+
 static void draw_unseen(screen_buffer_t* buffy, const coord_def &gc)
 {
 #ifndef USE_TILE