fiddlerwoaroof/crawl - Change OYTCBRC7LE44EUVRZVYTOOVKQWJ6P6YE3FXTOGUTNKEMLNWPHKSQC

Added glyphs_connected and friends for maps to test connectedness of points

after map transforms are applied.

Fixed conflicts in bison grammar.

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

Created by dshaligram on June 27, 2007

OYTCBRC7LE44EUVRZVYTOOVKQWJ6P6YE3FXTOGUTNKEMLNWPHKSQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/util/levcomp.ypp at line 65 [11.75608]
B:BD[11.75899] → [11.75899:75945]
```
%token BRANCHDEF BRANCH DESC DEFAULT
```
[11.75899]
[12.8]
```
/* Two harmless shift/reduce conflicts */
%expect 2
```
Replacement in crawl-ref/source/util/levcomp.ypp at line 72 [11.75608]
B:BD[11.76320] → [11.76320:76347]
B:BD[11.76347] → [13.250:297]
∅:D[13.297] → [11.76471:76495]
∅:D[14.447] → [11.76471:76495]
B:BD[11.76471] → [11.76471:76495]
```
%token CHARACTER
%token DASH COMMA QUOTE OPAREN CPAREN
%token INTEGER
```
[11.76320]
[11.76495]
```
%token COMMA INTEGER CHARACTER
```
Replacement in crawl-ref/source/util/levcomp.ypp at line 75 [11.75608]
B:BD[15.166] → [13.298:334]
```
%token <text> IDENTIFIER LUA_LINE
```
[15.166]
[11.76606]
```
%token <text> LUA_LINE
```
Replacement in crawl-ref/source/util/levcomp.ypp at line 126 [11.75608]
B:BD[8.176] → [8.176:209]
```
map_specs       : /* nothing */ 
```
[8.176]
[8.209]
```
map_specs       : /* nothing */      { }
```

Replacement in crawl-ref/source/util/levcomp.ypp at line 130 [11.75608]

B:BD[8.269] → [8.269:333]

map_spec        : metalines { }
                | map_def   { }

[8.269]

[11.77185]

map_spec        : metaline { }
                | map_def  { }

Deletion in crawl-ref/source/util/levcomp.ypp at line 156 [11.75608]
B:BD[11.77415] → [11.77415:77451]
B:BD[11.77451] → [8.334:371]
∅:D[8.371] → [11.77488:77507]
B:BD[11.77488] → [11.77488:77507]
```
metalines       : /* no metadata */
                | metalines metaline
                ;
```
Replacement in crawl-ref/source/util/levcomp.ypp at line 174 [11.75608]
B:BD[12.150] → [16.569:615]
```
global_lua        : MAIN global_lua_lines { }
```
[12.150]
[16.615]
```
global_lua      : MAIN global_lua_lines { }
```

Replacement in crawl-ref/source/util/levcomp.ypp at line 376 [11.75608]

B:BD[11.80942] → [11.80942:81006]

map_lines       : map_line
                | map_line map_lines

[11.80942]

[11.81006]

map_lines       : map_lines map_line
                | map_line

Deletion in crawl-ref/source/util/levcomp.lpp at line 186 [11.81193]
B:BD[11.84006] → [11.84006:84039]
```
-                   return DASH;
```

Deletion in crawl-ref/source/util/levcomp.lpp at line 196 [11.81193]

∅:D[15.2159] → [11.84474:84582]

B:BD[11.84474] → [11.84474:84582]

B:BD[11.84582] → [14.2341:2342]

B:BD[11.84583] → [17.124:149]

∅:D[17.149] → [11.84608:84709]

B:BD[11.84608] → [11.84608:84709]


\(                   return OPAREN;
\)                   return CPAREN;
\"                  return QUOTE;
[a-zA-Z_][a-zA-Z_0-9]* {
                        settext();
                        return IDENTIFIER;
                    }

Insertion in crawl-ref/source/travel.h at line 41 [18.29464]
[11.85650]
[18.30490]
```
bool is_traversable(int grid);
```
Insertion in crawl-ref/source/travel.h at line 522 [18.29464]
[19.4666]
[20.195]
```
    virtual bool point_traverse_delay(const coord_def &c);
```
Replacement in crawl-ref/source/travel.cc at line 189 [18.39949]
B:BD[18.45737] → [21.1880:1917]
```
inline bool is_traversable(int grid)
```
[18.45737]
[18.45784]
```
bool is_traversable(int grid)
```
Replacement in crawl-ref/source/travel.cc at line 1539 [18.39949]
∅:D[20.1141] → [19.21649:21710]
B:BD[19.21649] → [19.21649:21710]
```
bool travel_pathfind::path_examine_point(const coord_def &c)
```
[20.1141]
[19.21710]
```
bool travel_pathfind::point_traverse_delay(const coord_def &c)
```
Replacement in crawl-ref/source/travel.cc at line 1542 [18.39949]
B:BD[19.21746] → [19.21746:21770]
```
        return (false);
```
[19.21746]
[19.21770]
```
        return (true);
```
Insertion in crawl-ref/source/travel.cc at line 1548 [18.39949]
[19.21921]
[19.21921]
```
    return (false);
}
```

Insertion in crawl-ref/source/travel.cc at line 1552 [18.39949]

[19.21922]

bool travel_pathfind::path_examine_point(const coord_def &c)
{
    if (point_traverse_delay(c))
        return (false);

Replacement in crawl-ref/source/stuff.h at line 23 [22.217090]
B:BD[22.217548] → [22.217548:217576]
```
void tag_followers( void );
```
[22.217547]
[18.132884]
```
void tag_followers();
void untag_followers();
```
Replacement in crawl-ref/source/stuff.h at line 26 [22.217090]
B:BD[18.132885] → [18.132885:132906]
```
void seed_rng(void);
```
[18.132885]
[18.132907]
```
void seed_rng();
```
Replacement in crawl-ref/source/stuff.h at line 31 [22.217090]
B:BD[22.217812] → [22.217812:217835]
B:BD[22.218010] → [22.218010:218031]
```
void cf_setseed(void);
bool coinflip(void);
```
[18.132981]
[11.103182]
```
void cf_setseed();
bool coinflip();
```
Replacement in crawl-ref/source/stuff.h at line 37 [22.217090]
∅:D[11.103260] → [18.132982:133014]
B:BD[22.218443] → [18.132982:133014]
```
unsigned long random_int(void);
```
[11.103260]
[22.218617]
```
unsigned long random_int();
```
Replacement in crawl-ref/source/stuff.h at line 51 [22.217090]
∅:D[11.103526] → [22.220009:220037]
B:BD[22.220009] → [22.220009:220037]
```
unsigned char get_ch(void);
```
[11.103526]
[22.220038]
```
unsigned char get_ch();
```
Replacement in crawl-ref/source/stuff.h at line 60 [22.217090]
B:BD[22.220876] → [22.220876:220902]
```
void redraw_screen(void);
```
[22.220555]
[22.220903]
```
void redraw_screen();
```
Replacement in crawl-ref/source/stuff.h at line 93 [22.217090]
B:BD[22.223125] → [22.223125:223160]
```
unsigned char random_colour(void);
```
[22.222813]
[23.19]
```
unsigned char random_colour();
```

Replacement in crawl-ref/source/stuff.cc at line 149 [22.224557]

B:BD[22.228429] → [22.228429:228456]

unsigned char get_ch(void)

[22.228256]

[22.228456]

void untag_followers()
{
    for (int m = 0; m < MAX_MONSTERS; m++)
        menv[m].flags &= (~MF_TAKING_STAIRS);
}
unsigned char get_ch()

Insertion in crawl-ref/source/maps.cc at line 90 [22.2007666]
[24.537]
[25.1977]
```
    place.map.original = &mdef;
```
Insertion in crawl-ref/source/mapdef.h at line 182 [11.591249]
[11.592703]
[11.592703]
```
    int operator () (const coord_def &c) const;
    
```

Insertion in crawl-ref/source/mapdef.h at line 406 [11.591249]

[25.2851]

[24.2196]

class map_def;
dungeon_feature_type map_feature(map_def *map, const coord_def &c, int rawfeat);

Insertion in crawl-ref/source/mapdef.h at line 428 [11.591249]
[13.7334]
[13.7334]
```
    map_def         *original;
```

Insertion in crawl-ref/source/mapdef.h at line 442 [11.591249]

[26.5846]


    std::vector<coord_def> find_glyph(int glyph) const;
    coord_def find_first_glyph(int glyph) const;

Insertion in crawl-ref/source/mapdef.h at line 498 [11.591249]

[13.7913]


    int glyph_at(const coord_def &c) const;
public:
    struct map_feature_finder
    {
        map_def &map;
        map_feature_finder(map_def &map_) : map(map_) { }
        // This may actually modify the underlying map by fixing KFEAT:
        // feature slots, but that's fine by us.
        dungeon_feature_type operator () (const coord_def &c) const
        {
            return (map_feature(&map, c, -1));
        }
    };
    struct map_bounds_check
    {
        map_def &map;
        map_bounds_check(map_def &map_) : map(map_) { }
        bool operator () (const coord_def &c) const
        {
            return (c.x >= 0 && c.x < map.map.width()
                    && c.y >= 0 && c.y < map.map.height());
        }
    };

Insertion in crawl-ref/source/mapdef.cc at line 346 [11.594797]

[27.1537]

int map_lines::operator () (const coord_def &c) const
{
    return lines[c.y][c.x];
}

Replacement in crawl-ref/source/mapdef.cc at line 835 [11.594797]
∅:D[28.575] → [13.12721:12763]
B:BD[13.12721] → [13.12721:12763]
```
      index_only(false), cache_offset(0L)
```
[28.575]
[13.12763]
```
      validate("dlvalidate"), veto("dlveto"), index_only(false),
      cache_offset(0L)
```
Insertion in crawl-ref/source/mapdef.cc at line 866 [11.594797]
[11.598972]
[26.6494]
```
}
int map_def::glyph_at(const coord_def &c) const
{
    return map(c);
```

Insertion in crawl-ref/source/mapdef.cc at line 920 [11.594797]

[26.7922]

std::vector<coord_def> map_def::find_glyph(int glyph) const
{
    std::vector<coord_def> points;
    for (int y = map.height() - 1; y >= 0; --y)
    {
        for (int x = map.width() - 1; x >= 0; --x)
        {
            const coord_def c(x, y);
            if (map(c) == glyph)
                points.push_back(c);
        }
    }
    return (points);
}
coord_def map_def::find_first_glyph(int glyph) const
{
    for (int y = 0, height = map.height(); y < height; ++y)
    {
        for (int x = 0, width = map.width(); x < width; ++x)
        {
            const coord_def c(x, y);
            if (map(c) == glyph)
                return (c);
        }
    }
    return coord_def(-1, -1);
}

Insertion in crawl-ref/source/mapdef.cc at line 997 [11.594797]
[13.13051]
[26.9128]
```
    validate.set_file(s);
    veto.set_file(s);
```
Replacement in crawl-ref/source/mapdef.cc at line 1033 [11.594797]
B:BD[25.3667] → [25.3667:3672]
```
    
```
[25.3667]
[25.3672]
Deletion in crawl-ref/source/mapdef.cc at line 1042 [11.594797]
B:BD[25.3876] → [25.3876:3877]
Replacement in crawl-ref/source/mapdef.cc at line 1043 [11.594797]
B:BD[25.3919] → [25.3919:3957]
```
        dlua.fnreturns("b", &result);
```
[25.3919]
[25.3957]
```
        dlua.fnreturns(">b", &result);
```
Deletion in crawl-ref/source/mapdef.cc at line 1047 [11.594797]
B:BD[25.4064] → [25.4064:4065]
Deletion in crawl-ref/source/luadgn.h at line 39 [29.228]
B:BD[28.1015] → [10.832:867]
```
    void release_compiled_chunk();
```

Insertion in crawl-ref/source/luadgn.h at line 66 [29.228]

[29.1189]

int dlua_stringtable(lua_State *ls, const std::vector<std::string> &s);
//////////////////////////////////////////////////////////////////////////

Insertion in crawl-ref/source/luadgn.cc at line 14 [29.1232]
[10.889]
[10.889]
```
#include "dungeon.h"
```

Replacement in crawl-ref/source/luadgn.cc at line 37 [29.1232]

B:BD[29.1965] → [29.1965:2043]

static int dlua_stringtable(lua_State *ls, const std::vector<std::string> &s)

[29.1965]

[29.2043]

int dlua_stringtable(lua_State *ls, const std::vector<std::string> &s)

Replacement in crawl-ref/source/luadgn.cc at line 54 [29.1232]
B:BD[16.2745] → [10.999:1042]
```
    if (compiled.empty() && chunk.empty())
```
[16.2745]
[16.2819]
```
    if (empty())
```
Replacement in crawl-ref/source/luadgn.cc at line 190 [29.1232]
B:BD[29.3298] → [29.3298:3340]
```
    return trimmed_string(chunk).empty();
```
[29.3298]
[28.1395]
```
    return compiled.empty() && trimmed_string(chunk).empty();
```
Insertion in crawl-ref/source/luadgn.cc at line 197 [29.1232]
[7.348]
[7.348]

Insertion in crawl-ref/source/luadgn.cc at line 649 [29.1232]

[10.3434]


static int dgn_points_connected(lua_State *ls)
{
    MAP(ls, 1, map);
    const int nargs = lua_gettop(ls);
    if (nargs < 5)
        return luaL_error(ls,
                          "Not enough points to test connectedness "
                          "(need at least two)");
    
    map_def::map_feature_finder feat_finder(*map);
    map_def::map_bounds_check bounds_checker(*map);
    flood_find<map_def::map_feature_finder, map_def::map_bounds_check>
        finder(feat_finder, bounds_checker);

Insertion in crawl-ref/source/luadgn.cc at line 664 [29.1232]

[10.3435]

[29.12243]

    for (int i = 4; i < nargs; i += 2)
    {
        const coord_def c(luaL_checkint(ls, i),
                          luaL_checkint(ls, i + 1));
        finder.add_point(c);
    }
    const coord_def pos(luaL_checkint(ls, 2), luaL_checkint(ls, 3));
    const bool connected = finder.points_connected_from(pos);
    PLUARET(boolean, connected);
}
static void dlua_push_coord(lua_State *ls, const coord_def &c)
{
    lua_pushnumber(ls, c.x);
    lua_pushnumber(ls, c.y);
}
static int dgn_gly_point(lua_State *ls)
{
    MAP(ls, 1, map);
    coord_def c = map->find_first_glyph(*luaL_checkstring(ls, 2));
    if (c.x != -1 && c.y != -1)
    {
        dlua_push_coord(ls, c);
        return (2);
    }
    return (0);
}
static int dgn_gly_points(lua_State *ls)
{
    MAP(ls, 1, map);
    std::vector<coord_def> cs = map->find_glyph(*luaL_checkstring(ls, 2));
    for (int i = 0, size = cs.size(); i < size; ++i)
        dlua_push_coord(ls, cs[i]);
    return (cs.size() * 2);
}
static int dgn_original_map(lua_State *ls)
{
    MAP(ls, 1, map);
    if (map->original)
        clua_push_map(ls, map->original);
    else
        lua_pushnil(ls);
    return (1);
}

Insertion in crawl-ref/source/luadgn.cc at line 736 [29.1232]

[10.3462]

[29.12851]

    { "points_connected", dgn_points_connected },
    { "gly_point", dgn_gly_point },
    { "gly_points", dgn_gly_points },
    { "original_map", dgn_original_map },

Insertion in crawl-ref/source/luadgn.cc at line 742 [29.1232]

[29.12873]


static int crawl_args(lua_State *ls)
{
    return dlua_stringtable(ls, SysEnv.cmd_args);
}

Insertion in crawl-ref/source/luadgn.cc at line 748 [29.1232]

[29.12874]

static const struct luaL_reg crawl_lib[] =
{
    { "args", crawl_args },
    { NULL, NULL }
};

Insertion in crawl-ref/source/luadgn.cc at line 756 [29.1232]

[29.12900]

[9.227]

    luaL_openlib(dlua, "dgn", dgn_lib, 0);
    // Add additional function to the Crawl module.
    luaL_openlib(dlua, "crawl", crawl_lib, 0);

Replacement in crawl-ref/source/luadgn.cc at line 762 [29.1232]
B:BD[29.12983] → [29.12983:13048]
```
    lua_pop(dlua, 1);
    luaL_openlib(dlua, "dgn", dgn_lib, 0);
```
[29.12983]
[29.13048]
```
    lua_settop(dlua, 1);
```
Deletion in crawl-ref/source/libunix.h at line 4 [22.2548819]
B:BD[22.2548859] → [22.2548859:2548860]

Insertion in crawl-ref/source/initfile.cc at line 2569 [22.2957258]

[22.2982302]

    if (SysEnv.cmd_args.empty())
        for (int i = 1; i < argc; ++i)
            SysEnv.cmd_args.push_back(argv[i]);

Insertion in crawl-ref/source/externs.h at line 343 [22.3270163]
[22.3272143]
[22.3272143]
```
typedef bool (*coord_predicate)(const coord_def &c);
```
Insertion in crawl-ref/source/externs.h at line 1168 [22.3270163]
[22.3281637]
[22.3281637]
```
typedef FixedArray<dungeon_feature_type, GXM, GYM> feature_grid;
```

Replacement in crawl-ref/source/externs.h at line 1177 [22.3270163]

B:BD[22.3281862] → [30.7353:7423]

    FixedArray<dungeon_feature_type, GXM, GYM> grid;  // terrain grid

[22.3281862]

[22.3281930]

    feature_grid                             grid;  // terrain grid

Insertion in crawl-ref/source/externs.h at line 1291 [22.3270163]
[31.2273]
[22.3283192]
```
 std::vector<std::string> cmd_args;
```
Insertion in crawl-ref/source/dungeon.h at line 19 [22.3428186]
[22.3428499]
[22.3428499]
```
#include "misc.h"
#include "travel.h"
#include "stuff.h"
```
Deletion in crawl-ref/source/dungeon.h at line 95 [22.3428186]
B:BD[32.457] → [32.457:458]
Deletion in crawl-ref/source/dungeon.h at line 96 [22.3428186]
B:BD[32.1479] → [32.1479:1480]

Insertion in crawl-ref/source/dungeon.h at line 97 [22.3428186]

[32.1507]

bool place_specific_trap(int spec_x, int spec_y,  trap_type spec_type);
void place_spec_shop(int level_number, int shop_x, int shop_y,
                     int force_s_type, bool representative = false);
bool unforbidden(const coord_def &c, const dgn_region_list &forbidden);

Deletion in crawl-ref/source/dungeon.h at line 102 [22.3428186]

B:BD[32.1508] → [32.1508:1577]

B:BD[32.1577] → [30.7428:7475]

bool place_specific_trap(unsigned char spec_x, unsigned char spec_y,
                         trap_type spec_type);

Replacement in crawl-ref/source/dungeon.h at line 103 [22.3428186]

B:BD[32.1629] → [32.1629:1690]

B:BD[32.1690] → [3.449:572]

void place_spec_shop(int level_number, unsigned char shop_x,
                     unsigned char shop_y, unsigned char force_s_type,
                     bool representative = false );

[32.1629]

[32.1821]

//////////////////////////////////////////////////////////////////////////
template <typename fgrd, typename bound_check>
class flood_find : public travel_pathfind
{
public:
    flood_find(const fgrd &f, const bound_check &bc);

Replacement in crawl-ref/source/dungeon.h at line 110 [22.3428186]

∅:D[32.1822] → [33.747:819]

B:BD[33.747] → [33.747:819]

bool unforbidden(const coord_def &c, const dgn_region_list &forbidden);

[32.1822]

[34.148283]

    void add_feat(int feat);
    void add_point(const coord_def &pos);
    coord_def find_first_from(const coord_def &c, const dgn_region_list &vlts);
    bool points_connected_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;
    bool needed_features[NUM_FEATURES];
    std::vector<coord_def> needed_points;
    bool left_vault;
    dgn_region_list 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), needed_features(),
      needed_points(), left_vault(true), vaults(),
      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 dgn_region_list &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>::path_flood(
    const coord_def &c,
    const coord_def &dc)
{
    if (!bcheck(dc))
        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 grid = fgrid(dc);
    if (needed_features[ grid ])
    {
        unexplored_place = dc;
        unexplored_dist  = traveled_distance;
        return (true);
    }
    if (!is_traversable(grid)
        && grid != DNGN_SECRET_DOOR
        && !grid_is_trap(grid))
    {
        return (false);
    }
    if (!left_vault && unforbidden(dc, vaults))
        left_vault = true;
    good_square(dc);
    
    return (false);
}
//////////////////////////////////////////////////////////////////////////

Deletion in crawl-ref/source/dungeon.cc at line 282 [22.3429798]

B:BD[20.2196] → [20.2196:2590]


class feature_find : public travel_pathfind
{
public:
    feature_find();
    void add_feat(int feat);
    coord_def find_first_from(const coord_def &c);
    bool did_leave_vault() const { return left_vault; }
    
protected:
    bool path_flood(const coord_def &c, const coord_def &dc);
protected:
    bool needed_features[NUM_FEATURES];
    bool left_vault;
    dgn_region_list vaults;
};

Deletion in crawl-ref/source/dungeon.cc at line 283 [22.3429798]

B:BD[20.2591] → [20.2591:2620]

B:BD[20.2620] → [5.283:354]

∅:D[5.354] → [20.2692:3331]

B:BD[20.2692] → [20.2692:3331]

B:BD[20.3331] → [30.9088:9135]

∅:D[30.9135] → [20.3361:3667]

B:BD[20.3361] → [20.3361:3667]

B:BD[20.3667] → [2.158:206]

∅:D[2.206] → [20.3700:3777]

B:BD[20.3700] → [20.3700:3777]

feature_find::feature_find()
    : travel_pathfind(), needed_features(), left_vault(true), vaults()
{
    memset(needed_features, false, sizeof needed_features);
}
void feature_find::add_feat(int feat)
{
    if (feat >= 0 && feat < NUM_FEATURES)
        needed_features[feat] = true;
}
coord_def feature_find::find_first_from(const coord_def &c)
{
    set_floodseed(c);
    for (int i = 0, size = level_vaults.size(); i < size; ++i)
    {
        const vault_placement &p = level_vaults[i];
        vaults.push_back( dgn_region(p.x, p.y, p.width, p.height) );
    }
    
    return pathfind(RMODE_EXPLORE);
}
bool feature_find::path_flood(const coord_def &c, const coord_def &dc)
{
    if (!in_bounds(dc))
        return (false);
    
    const dungeon_feature_type grid = grd(dc);
    if (needed_features[ grid ])
    {
        unexplored_place = dc;
        unexplored_dist  = traveled_distance;
        return (true);
    }
    if (!is_travelsafe_square(dc.x, dc.y, false, true)
        && grid != DNGN_SECRET_DOOR
        && !grid_is_trap(grid))
    {
        return (false);
    }
    if (!left_vault && unforbidden(dc, vaults))
        left_vault = true;
    good_square(dc);
    
    return (false);
}

Replacement in crawl-ref/source/dungeon.cc at line 285 [22.3429798]
B:BD[20.3841] → [20.3841:3862]
```
 feature_find ff;
```
[20.3841]
[20.3862]
```
 flood_find<feature_grid, coord_predicate> ff(env.grid, in_bounds);
```
Replacement in crawl-ref/source/dungeon.cc at line 291 [22.3429798]
B:BD[20.4035] → [20.4035:4080]
```
    coord_def where = ff.find_first_from(c);
```
[20.4035]
[20.4080]
```
    coord_def where = ff.find_first_from(c, vault_zones);
```

Insertion in crawl-ref/source/dungeon.cc at line 3283 [22.3429798]

[4.389]

}
// Grr, keep this in sync with vault_grid.
dungeon_feature_type map_feature(map_def *map, const coord_def &c, int rawfeat)
{
    if (rawfeat == -1)
        rawfeat = map->glyph_at(c);
    
    keyed_mapspec *mapsp = map? map->mapspec_for_key(rawfeat) : NULL;
    if (mapsp)
    {
        const feature_spec f = mapsp->get_feat();
        if (f.feat >= 0)
            return static_cast<dungeon_feature_type>(f.feat);
        else if (f.glyph >= 0)
            return map_feature(NULL, c, rawfeat);
        else if (f.shop >= 0)
            return (DNGN_ENTER_SHOP);
        else if (f.trap >= 0)
            return (DNGN_UNDISCOVERED_TRAP);
        return (DNGN_FLOOR);
    }
    return ((rawfeat == 'x') ? DNGN_ROCK_WALL :
            (rawfeat == 'X') ? DNGN_PERMAROCK_WALL :
            (rawfeat == 'c') ? DNGN_STONE_WALL :
            (rawfeat == 'v') ? DNGN_METAL_WALL :
            (rawfeat == 'b') ? DNGN_GREEN_CRYSTAL_WALL :
            (rawfeat == 'a') ? DNGN_WAX_WALL :
            (rawfeat == '+') ? DNGN_CLOSED_DOOR :
            (rawfeat == '=') ? DNGN_SECRET_DOOR :
            (rawfeat == 'w') ? DNGN_DEEP_WATER :
            (rawfeat == 'W') ? DNGN_SHALLOW_WATER :
            (rawfeat == 'l') ? DNGN_LAVA :
            (rawfeat == '>') ? DNGN_ROCK_STAIRS_DOWN :
            (rawfeat == '<') ? DNGN_ROCK_STAIRS_UP :
            (rawfeat == '}') ? DNGN_STONE_STAIRS_DOWN_I :
            (rawfeat == '{') ? DNGN_STONE_STAIRS_UP_I :
            (rawfeat == ')') ? DNGN_STONE_STAIRS_DOWN_II :
            (rawfeat == '(') ? DNGN_STONE_STAIRS_UP_II :
            (rawfeat == ']') ? DNGN_STONE_STAIRS_DOWN_III :
            (rawfeat == '[') ? DNGN_STONE_STAIRS_UP_III :
            (rawfeat == 'A') ? DNGN_STONE_ARCH :
            (rawfeat == 'B') ? DNGN_ALTAR_ZIN : 
            (rawfeat == 'C') ? pick_an_altar() :   // f(x) elsewhere {dlb}
            (rawfeat == 'F') ? DNGN_GRANITE_STATUE :
            (rawfeat == 'I') ? DNGN_ORCISH_IDOL :
            (rawfeat == 'S') ? DNGN_SILVER_STATUE :
            (rawfeat == 'G') ? DNGN_GRANITE_STATUE :
            (rawfeat == 'H') ? DNGN_ORANGE_CRYSTAL_STATUE :
            (rawfeat == 'T') ? DNGN_BLUE_FOUNTAIN :
            (rawfeat == 'U') ? DNGN_SPARKLING_FOUNTAIN :
            (rawfeat == 'V') ? DNGN_PERMADRY_FOUNTAIN :
            (rawfeat == '\0')? DNGN_ROCK_WALL :
            DNGN_FLOOR); // includes everything else

Replacement in crawl-ref/source/dungeon.cc at line 3942 [22.3429798]

B:BD[11.971677] → [11.971677:971815]

                      unsigned char shop_x, unsigned char shop_y,
                      unsigned char force_s_type, bool representative )

[11.971677]

[22.3640152]

                      int shop_x, int shop_y,
                      int force_s_type, bool representative )

Replacement in crawl-ref/source/dungeon.cc at line 5873 [22.3429798]
B:BD[11.974058] → [11.974058:974127]
```
bool place_specific_trap(unsigned char spec_x, unsigned char spec_y,
```
[11.974058]
[30.14655]
```
bool place_specific_trap(int spec_x, int spec_y,
```
Insertion in crawl-ref/source/dat/splev.des at line 938 [11.1090923]
[6.356]
[35.2214]
```
validate {{ return glyphs_connected('{', 'O') }}
```

Insertion in crawl-ref/source/dat/clua/dungeon.lua at line 61 [13.17172]

[13.18206]

[13.18304]

   end
end
--------------------------------------------------------------------
function dgn.places_connected(map, map_glyph, test_connect, ...)
   local points = { }
   for _, glyph in ipairs( { ... } ) do
      local x, y = map_glyph(map, glyph)
      if x and y then
         table.insert(points, x)
         table.insert(points, y)
      else
         error("Can't find coords for '" .. glyph .. "'")
      end
   end
   return test_connect(map, unpack(points))
end
function dgn.glyphs_connected(map, ...)
   return dgn.places_connected(map, dgn.gly_point, dgn.points_connected, ...)
end
function dgn.orig_glyphs_connected(map, ...)
   return dgn.places_connected(map, dgn.orig_gly_point,
                               dgn.points_connected, ...)
end
function dgn.orig_fn(map, fnx, ...)
   local original = dgn.original_map(map)
   if not original then
      error("Can't find original map for map '" .. dgn.name(map) .. "'")

Insertion in crawl-ref/source/dat/clua/dungeon.lua at line 94 [13.17172]

[13.18311]

[25.8647]


   return fnx(original, ...)
end
function dgn.orig_gly_point(map, glyph)
   return dgn.orig_fn(map, dgn.gly_point, glyph)
end
function dgn.orig_gly_points(map, glyph)
   return dgn.orig_fn(map, dgn.gly_points, glyph)

Insertion in crawl-ref/source/clua.h at line 210 [18.481234]
[13.19400]
[13.19400]
```
class map_def;
void clua_push_map(lua_State *ls, map_def *map);
```
Deletion in crawl-ref/source/clua.cc at line 318 [18.483969]
B:BD[18.488830] → [18.488830:488831]
Deletion in crawl-ref/source/clua.cc at line 319 [18.483969]
B:BD[18.488861] → [18.488861:488862]
Deletion in crawl-ref/source/clua.cc at line 368 [18.483969]
B:BD[18.490072] → [13.19783:19834]
```
static void push_map(lua_State *ls, map_def *map);
```

Replacement in crawl-ref/source/clua.cc at line 415 [18.483969]

B:BD[13.19872] → [13.19872:19923]

            push_map(ls, va_arg(args, map_def *));

[13.19872]

[18.491243]

            clua_push_map(ls, va_arg(args, map_def *));

Replacement in crawl-ref/source/clua.cc at line 583 [18.483969]
B:BD[36.1036] → [36.1036:1041]
```
    
```
[36.1036]
[18.494899]
Insertion in crawl-ref/source/clua.cc at line 611 [18.483969]
[37.1265]
[18.495302]
```
    lua_settop(_state, 1);
```
Insertion in crawl-ref/source/clua.cc at line 1832 [18.483969]
[28.3588]
[28.3588]
```
LUARET1(crawl_random2, number, random2( luaL_checkint(ls, 1) ))
```
Replacement in crawl-ref/source/clua.cc at line 1863 [18.483969]
B:BD[28.4436] → [28.4436:4474]
```
    
    return (lua_gettop(ls));    
```
[28.4436]
[18.526862]
```
    return (lua_gettop(ls));
```
Insertion in crawl-ref/source/clua.cc at line 1871 [18.483969]
[18.526987]
[18.526987]
```
    { "random2",        crawl_random2 },
```
Replacement in crawl-ref/source/clua.cc at line 2170 [18.483969]
B:BD[18.534949] → [13.20704:20754]
```
static void push_map(lua_State *ls, map_def *map)
```
[18.534949]
[13.20754]
```
void clua_push_map(lua_State *ls, map_def *map)
```

Replacement in crawl-ref/source/acr.cc at line 1874 [22.4397395]

B:BD[22.4449086] → [38.56377:56430]

        you_teleport_now( true, one_chance_in(5) );

[22.4449086]

[22.4449136]

        you_teleport_now( true, one_chance_in(5) );
        untag_followers();

Added glyphs_connected and friends for maps to test connectedness of points

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/util/levcomp.ypp at line 65 [11.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 72 [11.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 75 [11.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 126 [11.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 130 [11.75608]

Deletion in crawl-ref/source/util/levcomp.ypp at line 156 [11.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 174 [11.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 376 [11.75608]

Deletion in crawl-ref/source/util/levcomp.lpp at line 186 [11.81193]

Deletion in crawl-ref/source/util/levcomp.lpp at line 196 [11.81193]

Insertion in crawl-ref/source/travel.h at line 41 [18.29464]

Insertion in crawl-ref/source/travel.h at line 522 [18.29464]

Replacement in crawl-ref/source/travel.cc at line 189 [18.39949]

Replacement in crawl-ref/source/travel.cc at line 1539 [18.39949]

Replacement in crawl-ref/source/travel.cc at line 1542 [18.39949]

Insertion in crawl-ref/source/travel.cc at line 1548 [18.39949]

Insertion in crawl-ref/source/travel.cc at line 1552 [18.39949]

Replacement in crawl-ref/source/stuff.h at line 23 [22.217090]

Replacement in crawl-ref/source/stuff.h at line 26 [22.217090]

Replacement in crawl-ref/source/stuff.h at line 31 [22.217090]

Replacement in crawl-ref/source/stuff.h at line 37 [22.217090]

Replacement in crawl-ref/source/stuff.h at line 51 [22.217090]

Replacement in crawl-ref/source/stuff.h at line 60 [22.217090]

Replacement in crawl-ref/source/stuff.h at line 93 [22.217090]

Replacement in crawl-ref/source/stuff.cc at line 149 [22.224557]

Insertion in crawl-ref/source/maps.cc at line 90 [22.2007666]

Insertion in crawl-ref/source/mapdef.h at line 182 [11.591249]

Insertion in crawl-ref/source/mapdef.h at line 406 [11.591249]

Insertion in crawl-ref/source/mapdef.h at line 428 [11.591249]

Insertion in crawl-ref/source/mapdef.h at line 442 [11.591249]

Insertion in crawl-ref/source/mapdef.h at line 498 [11.591249]

Insertion in crawl-ref/source/mapdef.cc at line 346 [11.594797]

Replacement in crawl-ref/source/mapdef.cc at line 835 [11.594797]

Insertion in crawl-ref/source/mapdef.cc at line 866 [11.594797]

Insertion in crawl-ref/source/mapdef.cc at line 920 [11.594797]

Insertion in crawl-ref/source/mapdef.cc at line 997 [11.594797]

Replacement in crawl-ref/source/mapdef.cc at line 1033 [11.594797]

Deletion in crawl-ref/source/mapdef.cc at line 1042 [11.594797]

Replacement in crawl-ref/source/mapdef.cc at line 1043 [11.594797]

Deletion in crawl-ref/source/mapdef.cc at line 1047 [11.594797]

Deletion in crawl-ref/source/luadgn.h at line 39 [29.228]

Insertion in crawl-ref/source/luadgn.h at line 66 [29.228]

Insertion in crawl-ref/source/luadgn.cc at line 14 [29.1232]

Replacement in crawl-ref/source/luadgn.cc at line 37 [29.1232]

Replacement in crawl-ref/source/luadgn.cc at line 54 [29.1232]

Replacement in crawl-ref/source/luadgn.cc at line 190 [29.1232]

Insertion in crawl-ref/source/luadgn.cc at line 197 [29.1232]

Insertion in crawl-ref/source/luadgn.cc at line 649 [29.1232]

Insertion in crawl-ref/source/luadgn.cc at line 664 [29.1232]

Insertion in crawl-ref/source/luadgn.cc at line 736 [29.1232]

Insertion in crawl-ref/source/luadgn.cc at line 742 [29.1232]

Insertion in crawl-ref/source/luadgn.cc at line 748 [29.1232]

Insertion in crawl-ref/source/luadgn.cc at line 756 [29.1232]

Replacement in crawl-ref/source/luadgn.cc at line 762 [29.1232]

Deletion in crawl-ref/source/libunix.h at line 4 [22.2548819]

Insertion in crawl-ref/source/initfile.cc at line 2569 [22.2957258]

Insertion in crawl-ref/source/externs.h at line 343 [22.3270163]

Insertion in crawl-ref/source/externs.h at line 1168 [22.3270163]

Replacement in crawl-ref/source/externs.h at line 1177 [22.3270163]

Insertion in crawl-ref/source/externs.h at line 1291 [22.3270163]

Insertion in crawl-ref/source/dungeon.h at line 19 [22.3428186]

Deletion in crawl-ref/source/dungeon.h at line 95 [22.3428186]

Deletion in crawl-ref/source/dungeon.h at line 96 [22.3428186]

Insertion in crawl-ref/source/dungeon.h at line 97 [22.3428186]

Deletion in crawl-ref/source/dungeon.h at line 102 [22.3428186]

Replacement in crawl-ref/source/dungeon.h at line 103 [22.3428186]

Replacement in crawl-ref/source/dungeon.h at line 110 [22.3428186]

Deletion in crawl-ref/source/dungeon.cc at line 282 [22.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 283 [22.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 285 [22.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 291 [22.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 3283 [22.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3942 [22.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 5873 [22.3429798]

Insertion in crawl-ref/source/dat/splev.des at line 938 [11.1090923]

Insertion in crawl-ref/source/dat/clua/dungeon.lua at line 61 [13.17172]