Reduce dependency on travel.h

Removed inclusion of travel.h from most .h files to reduce the number
of .cc files dependant on it.  This involved moving the level_pos
declaration to externs.h, moving the flood_find template to it's own
header file, and moving two typedefs from travel.h to travel_defs.h
because typedefs can't be forward declared (argh).

1 files changed, 2 insertions, 162 deletions

diff --git a/crawl-ref/source/dungeon.h b/crawl-ref/source/dungeon.h
index c2f5e7456f..590a91b897 100644
--- a/crawl-ref/source/dungeon.h
+++ b/crawl-ref/source/dungeon.h
@@ -11,7 +11,6 @@
 #include "fixedarray.h"
 #include "externs.h"
 #include "terrain.h"
-#include "travel.h"
 #include "stuff.h"
 #include "mapdef.h"
 
@@ -19,6 +18,8 @@
 #include <set>
 #include <algorithm>
 
+class map_mask;
+
 #define BUILD_METHOD_KEY "build_method_key"
 #define LAYOUT_TYPE_KEY  "layout_type_key"
 #define LEVEL_VAULTS_KEY "level_vaults_key"
@@ -49,8 +50,6 @@ const int MAKE_GOOD_ITEM = 351;
 // Should be the larger of GXM/GYM
 #define MAP_SIDE ( (GXM) > (GYM) ? (GXM) : (GYM) )
 
-typedef FixedArray<unsigned short, GXM, GYM> map_mask;
-
 // Map mask constants.
 
 enum map_mask_type
@@ -162,7 +161,6 @@ public:
     void draw_at(const coord_def &c);
 };
 
-extern map_mask dgn_Map_Mask;
 extern bool Generating_Level;
 extern std::string dgn_Layout_Type;
 
@@ -172,164 +170,6 @@ extern std::set<std::string> Level_Unique_Tags;
 extern std::vector<vault_placement> Level_Vaults;
 extern std::vector<vault_placement> Temp_Vaults;
 
-//////////////////////////////////////////////////////////////////////////
-template <typename fgrd, typename bound_check>
-class flood_find : public travel_pathfind
-{
-public:
-    flood_find(const fgrd &f, const bound_check &bc);
-
-    void add_feat(int feat);
-    void add_point(const coord_def &pos);
-    coord_def find_first_from(const coord_def &c, const map_mask &vlts);
-    bool points_connected_from(const coord_def &start);
-    bool any_point_connected_from(const coord_def &start);
-    bool has_exit_from(const coord_def &start);
-
-    bool did_leave_vault() const { return left_vault; }
-
-protected:
-    bool path_flood(const coord_def &c, const coord_def &dc);
-protected:
-    bool point_hunt, want_exit;
-    bool needed_features[NUM_FEATURES];
-    std::vector<coord_def> needed_points;
-    bool left_vault;
-    const map_mask *vaults;
-
-    const fgrd &fgrid;
-    const bound_check &bcheck;
-};
-
-template <typename fgrd, typename bound_check>
-flood_find<fgrd, bound_check>::flood_find(const fgrd &f, const bound_check &bc)
-    : travel_pathfind(), point_hunt(false), want_exit(false),
-      needed_features(), needed_points(), left_vault(true), vaults(NULL),
-      fgrid(f), bcheck(bc)
-{
-    memset(needed_features, false, sizeof needed_features);
-}
-
-template <typename fgrd, typename bound_check>
-void flood_find<fgrd, bound_check>::add_feat(int feat)
-{
-    if (feat >= 0 && feat < NUM_FEATURES)
-        needed_features[feat] = true;
-}
-
-template <typename fgrd, typename bound_check>
-coord_def
-flood_find<fgrd, bound_check>::find_first_from(
-    const coord_def &c,
-    const map_mask &vlts)
-{
-    set_floodseed(c);
-    vaults = &vlts;
-    return pathfind(RMODE_EXPLORE);
-}
-
-template <typename fgrd, typename bound_check>
-void flood_find<fgrd, bound_check>::add_point(const coord_def &c)
-{
-    needed_points.push_back(c);
-}
-
-template <typename fgrd, typename bound_check>
-bool flood_find<fgrd, bound_check>::points_connected_from(
-    const coord_def &sp)
-{
-    if (needed_points.empty())
-        return (true);
-    set_floodseed(sp);
-    pathfind(RMODE_EXPLORE);
-    return (needed_points.empty());
-}
-
-template <typename fgrd, typename bound_check>
-bool flood_find<fgrd, bound_check>::any_point_connected_from(
-    const coord_def &sp)
-{
-    if (needed_points.empty())
-        return (true);
-    set_floodseed(sp);
-    const size_t sz = needed_points.size();
-    pathfind(RMODE_EXPLORE);
-    return (needed_points.size() < sz);
-}
-
-template <typename fgrd, typename bound_check>
-bool flood_find<fgrd, bound_check>::has_exit_from(
-    const coord_def &sp)
-{
-    want_exit = true;
-    set_floodseed(sp);
-    return (pathfind(RMODE_EXPLORE) == coord_def(-1, -1));
-}
-
-template <typename fgrd, typename bound_check>
-bool flood_find<fgrd, bound_check>::path_flood(
-    const coord_def &c,
-    const coord_def &dc)
-{
-    if (!bcheck(dc))
-    {
-        if (want_exit)
-        {
-            greedy_dist = 100;
-            greedy_place = coord_def(-1, -1);
-            return (true);
-        }
-        return (false);
-    }
-
-    if (!needed_points.empty())
-    {
-        std::vector<coord_def>::iterator i =
-            std::find(needed_points.begin(), needed_points.end(), dc);
-        if (i != needed_points.end())
-        {
-            needed_points.erase(i);
-            if (needed_points.empty())
-                return (true);
-        }
-    }
-
-    const dungeon_feature_type feat = fgrid(dc);
-
-    if (feat == NUM_FEATURES)
-    {
-        if (want_exit)
-        {
-            greedy_dist = 100;
-            greedy_place = coord_def(-1, -1);
-            return (true);
-        }
-        return (false);
-    }
-
-    if (needed_features[ feat ])
-    {
-        unexplored_place = dc;
-        unexplored_dist  = traveled_distance;
-        return (true);
-    }
-
-    if (!feat_is_traversable(feat)
-        && feat != DNGN_SECRET_DOOR
-        && !feat_is_trap(feat))
-    {
-        return (false);
-    }
-
-    if (!left_vault && vaults && !(*vaults)[dc.x][dc.y])
-        left_vault = true;
-
-    good_square(dc);
-
-    return (false);
-}
-//////////////////////////////////////////////////////////////////////////
-
 void init_level_connectivity();
 void read_level_connectivity(reader &th);
 void write_level_connectivity(writer &th);