1 files changed, 18 insertions, 8 deletions

diff --git a/crawl-ref/source/view.h b/crawl-ref/source/view.h
index f51d6fcd7b..931746f980 100644
--- a/crawl-ref/source/view.h
+++ b/crawl-ref/source/view.h
@@ -100,8 +100,7 @@ void find_features(const std::vector<coord_def>& features,
 /* ***********************************************************************
  * called from: direct - monstufff - view
  * *********************************************************************** */
-void losight(FixedArray<unsigned int, ENV_SHOW_DIAMETER, ENV_SHOW_DIAMETER>& sh,
-             FixedArray<dungeon_feature_type, GXM, GYM>& gr,
+void losight(env_show_grid &sh, feature_grid &gr,
              int x_p, int y_p, bool clear_walls_block = false);
 
 
@@ -190,16 +189,27 @@ void add_feature_override(const std::string &text);
 void clear_cset_overrides();
 void add_cset_override(char_set_type set, const std::string &overrides);
 
-bool see_grid( int grx, int gry );
-inline bool see_grid(const coord_def &p) { return see_grid(p.x, p.y); }
+bool see_grid( const env_show_grid &show,
+               const coord_def &c,
+               const coord_def &pos );
+bool see_grid(const coord_def &p);
+bool see_grid_no_trans( const coord_def &p );
+bool trans_wall_blocking( const coord_def &p );
 
-bool see_grid_no_trans( int grx, int gry );
-inline bool see_grid_no_trans(const coord_def &p)
+inline bool see_grid( int grx, int gry )
 {
-    return see_grid_no_trans(p.x, p.y);
+    return see_grid(coord_def(grx, gry));
 }
 
-bool trans_wall_blocking( int grx, int gry );
+inline bool see_grid_no_trans(int x, int y)
+{
+    return see_grid_no_trans(coord_def(x, y));
+}
+
+inline bool trans_wall_blocking(int x, int y)
+{
+    return trans_wall_blocking(coord_def(x, y));
+}
 
 std::string screenshot(bool fullscreen = false);