fiddlerwoaroof/crawl - Change C22455VGUQOSUX2OORA32LROFQ7NNYDMD2ZDTTUZSAQLXK4AD6QAC

Extend rectangular vault support for regular vaults.

Vault collision checking is also non-rectangular now.

Fixed Windows builds not reporting line numbers in .des file error messages.

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

Created by dshaligram on July 7, 2007

C22455VGUQOSUX2OORA32LROFQ7NNYDMD2ZDTTUZSAQLXK4AD6QAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monplace.h at line 84 [6.1638277]

∅:D[4.349] → [5.155:265]

B:BD[7.245851] → [5.155:265]

                    int dur = 0,
                    const dgn_region_list &proscribed = dgn_region_list() );

[4.349]

[8.450207]

                    int dur = 0, unsigned mmask = 0 );

Replacement in crawl-ref/source/monplace.cc at line 147 [6.1641732]
∅:D[4.416] → [5.401:454]
B:BD[5.401] → [5.401:454]
```
                   const dgn_region_list &forbidden)
```
[4.416]
[6.1642902]
```
                   unsigned mmask)
```

Replacement in crawl-ref/source/monplace.cc at line 318 [6.1641732]

B:BD[5.601] → [5.601:663]

            if (!unforbidden( coord_def(px, py), forbidden ))

[5.601]

[6.1647527]

            if (!unforbidden( coord_def(px, py), mmask ))

Replacement in crawl-ref/source/maps.cc at line 195 [6.2007666]

B:BD[9.2395] → [9.2395:2434]

        if (thisvault.overlaps(vault))

[9.2395]

[9.2434]

        if (thisvault.overlaps(vault) && thisvault.overlaps(dgn_map_mask))

Insertion in crawl-ref/source/mapdef.h at line 179 [8.591249]
[8.592232]
[8.592232]
```
    bool in_map(const coord_def &pos) const;
    
```
Insertion in crawl-ref/source/mapdef.h at line 505 [8.591249]
[10.1478]
[10.1478]
```
    bool in_map(const coord_def &p) const;
    
```

Insertion in crawl-ref/source/mapdef.cc at line 362 [8.594797]

[10.2409]

}
bool map_lines::in_map(const coord_def &c) const
{
    return (lines[c.y][c.x] != ' ');

Insertion in crawl-ref/source/mapdef.cc at line 1112 [8.594797]
[10.2505]
[10.2505]
```
bool map_def::in_map(const coord_def &c) const
{
    return map.in_map(c);
}
```

Replacement in crawl-ref/source/makeitem.h at line 15 [11.516]

B:BD[11.701] → [11.701:768]

           const dgn_region_list &forbidden = dgn_region_list() );

[11.701]

[11.768]

           unsigned mapmask = 0 );

Replacement in crawl-ref/source/makeitem.cc at line 858 [11.927]
B:BD[11.23833] → [11.23833:23879]
```
           const dgn_region_list &forbidden) 
```
[11.23833]
[11.23879]
```
           unsigned mapmask) 
```

Replacement in crawl-ref/source/makeitem.cc at line 2867 [11.927]

B:BD[11.98432] → [11.98432:98501]

               || !unforbidden(coord_def(x_pos, y_pos), forbidden));

[11.98432]

[11.98501]

               || !unforbidden(coord_def(x_pos, y_pos), mapmask));

Replacement in crawl-ref/source/luadgn.h at line 37 [14.228]

∅:D[12.831] → [13.884:953]

B:BD[14.690] → [13.884:953]

    std::string rewrite_chunk_prefix(const std::string &line) const;

[12.831]

[13.953]

    std::string rewrite_chunk_prefix(const std::string &line,
                                     bool skip_body = false) const;

Replacement in crawl-ref/source/luadgn.cc at line 230 [14.1232]

B:BD[14.3343] → [13.2179:2255]

std::string dlua_chunk::rewrite_chunk_prefix(const std::string &line) const

[14.3343]

[13.2255]

std::string dlua_chunk::rewrite_chunk_prefix(const std::string &line,
                                             bool skip_body) const

Insertion in crawl-ref/source/luadgn.cc at line 239 [14.1232]
[13.2459]
[13.2459]
```
    const std::string::size_type lns = ps + contextm.length();
```
Deletion in crawl-ref/source/luadgn.cc at line 243 [14.1232]
B:BD[13.2567] → [13.2567:2634]
```
        const std::string::size_type lns = ps + contextm.length();
```

Replacement in crawl-ref/source/luadgn.cc at line 250 [14.1232]

B:BD[13.2914] → [13.2914:2958]

        + s.substr(ps + contextm.length());

[13.2914]

[13.2958]

        + (skip_body? s.substr(lns, pe - lns)
                    : s.substr(lns));

Replacement in crawl-ref/source/luadgn.cc at line 256 [14.1232]

B:BD[13.3036] → [13.3036:3344]

    std::string s = rewrite_chunk_prefix(sorig);
    const std::string::size_type cpos = s.find(':');
    if (cpos == std::string::npos)
        return (s);
    const std::string::size_type cnpos = s.find(':', cpos + 1);
    if (cnpos == std::string::npos)
        return (s);
    return s.substr(0, cnpos);

[13.3036]

[13.3344]

    return rewrite_chunk_prefix(sorig, true);

Insertion in crawl-ref/source/dungeon.h at line 18 [6.3428186]
[6.3428478]
[6.3428478]
```
#include "FixAry.h"
```
Insertion in crawl-ref/source/dungeon.h at line 33 [6.3428186]
[8.948130]
[8.948280]
```
typedef FixedArray<unsigned short, GXM, GYM> map_mask;
```

Insertion in crawl-ref/source/dungeon.h at line 35 [6.3428186]

[8.948281]

[15.147105]

extern map_mask dgn_map_mask;
// Map mask constants.
enum map_mask_type
{
    MMT_NONE       = 0x0,
    MMT_VAULT      = 0x01,    // This is a square in a vault.
    MMT_NO_ITEM    = 0x02,    // Random items should not be placed here.
    MMT_NO_MONS    = 0x04,    // Random monsters should not be placed here.
    MMT_NO_POOL    = 0x08,    // Pool fixup should not be applied here.
    MMT_NO_DOOR    = 0x10     // No secret-doorisation.
};

Insertion in crawl-ref/source/dungeon.h at line 108 [6.3428186]

[15.148280]

    bool overlaps(const dgn_region_list &others,
                  const map_mask &dgn_map_mask) const;
    bool overlaps(const map_mask &dgn_map_mask) const;

Replacement in crawl-ref/source/dungeon.h at line 119 [6.3428186]

B:BD[10.6568] → [10.6568:6640]

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

[10.6568]

[16.17616]

bool unforbidden(const coord_def &c, unsigned mask);

Replacement in crawl-ref/source/dungeon.h at line 174 [6.3428186]

B:BD[10.6941] → [10.6941:7021]

    coord_def find_first_from(const coord_def &c, const dgn_region_list &vlts);

[10.6941]

[10.7021]

    coord_def find_first_from(const coord_def &c, const map_mask &vlts);

Replacement in crawl-ref/source/dungeon.h at line 188 [6.3428186]
B:BD[10.7347] → [10.7347:7375]
```
    dgn_region_list vaults;
```
[10.7347]
[10.7375]
```
    const map_mask *vaults;
```

Replacement in crawl-ref/source/dungeon.h at line 197 [6.3428186]

B:BD[17.1693] → [17.1693:1763]

      needed_features(), needed_points(), left_vault(true), vaults(),

[17.1693]

[10.7675]

      needed_features(), needed_points(), left_vault(true), vaults(NULL),

Replacement in crawl-ref/source/dungeon.h at line 214 [6.3428186]
B:BD[10.8083] → [10.8083:8116]
```
    const dgn_region_list &vlts)
```
[10.8083]
[10.8116]
```
    const map_mask &vlts)
```
Replacement in crawl-ref/source/dungeon.h at line 217 [6.3428186]
B:BD[10.8140] → [10.8140:8159]
```
    vaults = vlts;
```
[10.8140]
[10.8159]
```
    vaults = &vlts;
```
Replacement in crawl-ref/source/dungeon.h at line 314 [6.3428186]
B:BD[10.9473] → [10.9473:9521]
```
    if (!left_vault && unforbidden(dc, vaults))
```
[10.9473]
[10.9521]
```
    if (!left_vault && vaults && !(*vaults)(dc))
```

Replacement in crawl-ref/source/dungeon.cc at line 107 [6.3429798]

B:BD[18.464] → [18.464:544]

                         const dgn_region_list &forbidden = dgn_region_list());

[18.464]

[19.380]

                         unsigned mmask = 0);

Replacement in crawl-ref/source/dungeon.cc at line 138 [6.3429798]
B:BD[15.148387] → [9.3396:3434]
```
    const dgn_region_list &forbidden,
```
[15.148387]
[9.3434]
```
    unsigned mmask,
```
Replacement in crawl-ref/source/dungeon.cc at line 203 [6.3429798]
B:BD[5.972] → [5.972:1013]
B:BD[5.1013] → [20.1824:1862]
∅:D[20.1862] → [21.117193:117237]
B:BD[5.1013] → [21.117193:117237]
B:BD[21.117237] → [22.158:202]
```
static dgn_region_list no_monster_zones;
static dgn_region_list no_item_zones;
static dgn_region_list no_pool_fixup_zones;
static dgn_region_list no_door_fixup_zones;
```
[5.972]
[23.282]
```
map_mask dgn_map_mask;
```

Insertion in crawl-ref/source/dungeon.cc at line 253 [6.3429798]

[24.6635]

}
static void mask_vault(const vault_placement &place, unsigned mask)
{
    for (int y = place.y + place.height - 1; y >= place.y; --y)
        for (int x = place.x + place.width - 1; x >= place.x; --x)
            if (place.map.in_map(coord_def(x - place.x, y - place.y)))
                dgn_map_mask[x][y] |= mask;

Insertion in crawl-ref/source/dungeon.cc at line 262 [6.3429798]

[24.6637]


static void apply_place_masks(const vault_placement &place)
{
    mask_vault(place, MMT_VAULT | MMT_NO_DOOR);
    if (place.map.has_tag("no_monster_gen"))
        mask_vault(place, MMT_NO_MONS);

Insertion in crawl-ref/source/dungeon.cc at line 269 [6.3429798]

[24.6638]

    if (place.map.has_tag("no_item_gen"))
        mask_vault(place, MMT_NO_ITEM);
    if (place.map.has_tag("no_pool_fixup"))
        mask_vault(place, MMT_NO_POOL);
}

Replacement in crawl-ref/source/dungeon.cc at line 304 [6.3429798]

B:BD[25.4035] → [10.9746:9804]

    coord_def where = ff.find_first_from(c, vault_zones);

[25.4035]

[25.4080]

    coord_def where = ff.find_first_from(c, dgn_map_mask);

Insertion in crawl-ref/source/dungeon.cc at line 327 [6.3429798]
[25.4589]
[25.4590]
```
    dgn_map_mask.init(0);
```
Deletion in crawl-ref/source/dungeon.cc at line 329 [6.3429798]
∅:D[25.4616] → [5.1014:1044]
B:BD[6.3436216] → [5.1014:1044]
B:BD[5.1044] → [20.1863:1890]
∅:D[20.1890] → [21.117238:117271]
B:BD[5.1044] → [21.117238:117271]
B:BD[21.117271] → [22.203:236]
```
    no_monster_zones.clear();
    no_item_zones.clear();
    no_pool_fixup_zones.clear();
    no_door_fixup_zones.clear();
```

Replacement in crawl-ref/source/dungeon.cc at line 618 [6.3429798]

B:BD[22.305] → [22.305:377]

                && unforbidden(coord_def(dx, dy), no_door_fixup_zones))

[22.305]

[6.3549364]

                && unforbidden(coord_def(dx, dy), MMT_NO_DOOR))

Replacement in crawl-ref/source/dungeon.cc at line 930 [6.3429798]

B:BD[6.3551474] → [21.117272:117340]

            if (!unforbidden(coord_def(i, j), no_pool_fixup_zones))

[6.3551474]

[21.117340]

            if (!unforbidden(coord_def(i, j), MMT_NO_POOL))

Replacement in crawl-ref/source/dungeon.cc at line 1941 [6.3429798]

B:BD[26.2103] → [26.2103:2173]

                           PROX_ANYWHERE, 250, 0, no_monster_zones ))

[26.2103]

[26.2173]

                           PROX_ANYWHERE, 250, 0, MMT_NO_MONS ))

Replacement in crawl-ref/source/dungeon.cc at line 1963 [6.3429798]

B:BD[26.2650] → [26.2650:2697]

                           no_monster_zones ))

[26.2650]

[6.3578044]

                           MMT_NO_MONS ))

Replacement in crawl-ref/source/dungeon.cc at line 2035 [6.3429798]

B:BD[26.4038] → [26.4038:4081]

                       no_monster_zones );

[26.4038]

[6.3581558]

                       MMT_NO_MONS );

Replacement in crawl-ref/source/dungeon.cc at line 2083 [6.3429798]
B:BD[20.2367] → [20.2367:2403]
```
                   no_item_zones );
```
[20.2367]
[6.3582930]
```
                   MMT_NO_ITEM );
```

Replacement in crawl-ref/source/dungeon.cc at line 2093 [6.3429798]

B:BD[20.2475] → [20.2475:2521]

                             no_item_zones );

[20.2475]

[6.3583365]

                             MMT_NO_ITEM );

Replacement in crawl-ref/source/dungeon.cc at line 2553 [6.3429798]
B:BD[23.452] → [23.452:491]
```
    if (reg.overlaps_any(vault_zones))
```
[23.452]
[23.491]
```
    if (reg.overlaps(vault_zones, dgn_map_mask))
```
Insertion in crawl-ref/source/dungeon.cc at line 2556 [6.3429798]
[23.515]
[27.1490]
```
    
```
Insertion in crawl-ref/source/dungeon.cc at line 2665 [6.3429798]
[23.609]
[18.2756]
```
    apply_place_masks(place);
```

Deletion in crawl-ref/source/dungeon.cc at line 2687 [6.3429798]

B:BD[6.3597304] → [21.118508:118509]

B:BD[21.118509] → [22.378:482]

B:BD[22.482] → [28.1159:1465]

∅:D[28.1465] → [29.5558:5602]

B:BD[22.487] → [29.5558:5602]

∅:D[29.5602] → [21.118554:118666]

B:BD[21.118554] → [21.118554:118666]


    no_door_fixup_zones.push_back(
        dgn_region( place.x, place.y, place.width, place.height ) );
    if (place.map.has_tag("no_monster_gen"))
        no_monster_zones.push_back(
            dgn_region( place.x, place.y, place.width, place.height ) );
    if (place.map.has_tag("no_item_gen"))
        no_item_zones.push_back( 
            dgn_region( place.x, place.y, place.width, place.height ) );
    if (place.map.has_tag("no_pool_fixup"))
        no_pool_fixup_zones.push_back(
            dgn_region( place.x, place.y, place.width, place.height ) );

Replacement in crawl-ref/source/dungeon.cc at line 2718 [6.3429798]

B:BD[15.150491] → [30.489:559]

        while (myroom.overlaps_any(excluded) && overlap_tries-- > 0);

[15.150491]

[30.559]

        while (myroom.overlaps(excluded, dgn_map_mask) && overlap_tries-- > 0);

Replacement in crawl-ref/source/dungeon.cc at line 2726 [6.3429798]

B:BD[15.150629] → [2.158:230]

            if (join_the_dots(c, myroom.random_edge_point(), excluded))

[15.150629]

[2.230]

            if (join_the_dots(c, myroom.random_edge_point(), MMT_VAULT))

Replacement in crawl-ref/source/dungeon.cc at line 2763 [6.3429798]
B:BD[15.151837] → [15.151837:151865]
```
                excluded );
```
[15.151837]
[15.151865]
```
                MMT_VAULT );
```

Insertion in crawl-ref/source/dungeon.cc at line 2885 [6.3429798]

[31.280]

[29.5760]

static bool map_grid_is_on_edge(const vault_placement &place,
                                const coord_def &c)
{
    for (int xi = c.x - 1; xi <= c.x + 1; ++xi)
        for (int yi = c.y - 1; yi <= c.y + 1; ++yi)
            if (!place.map.in_map(coord_def(xi, yi)))
                return (true);
    return (false);
}
static void pick_internal_float_exits(const vault_placement &place,
                                      std::vector<coord_def> &exits)
{
    for (int y = place.y + 1; y < place.y + place.height - 1; ++y)
        for (int x = place.x + 1; x < place.x + place.width - 1; ++x)
            if (grid_needs_exit(x, y)
                && map_grid_is_on_edge(place, coord_def(x, y)))
            {
                exits.push_back( coord_def(x, y) );
            }
}

Insertion in crawl-ref/source/dungeon.cc at line 2927 [6.3429798]
[15.153945]
[6.3597362]
```
    pick_internal_float_exits(place, possible_exits);
```

Replacement in crawl-ref/source/dungeon.cc at line 2961 [6.3429798]

B:BD[9.6547] → [9.6547:6922]

static dgn_region_list get_vault_regions()
{
    dgn_region_list vaults;
    for (int i = 0, size = level_vaults.size(); i < size; ++i)
    {
        const vault_placement &vp = level_vaults[i];
        vaults.push_back(dgn_region(vp.x, vp.y, vp.width, vp.height));
    }
    return (vaults);
}
static coord_def find_random_grid(int grid, const dgn_region_list &excluded)

[9.6547]

[9.6922]

static coord_def find_random_grid(int grid, unsigned mask)

Replacement in crawl-ref/source/dungeon.cc at line 2970 [6.3429798]

B:BD[9.7193] → [9.7193:7249]

        if (unforbidden(c, excluded) && grd(c) == grid)

[9.7193]

[9.7249]

        if (unforbidden(c, mask) && grd(c) == grid)

Deletion in crawl-ref/source/dungeon.cc at line 2979 [6.3429798]
B:BD[9.7438] → [9.7438:7489]
```
    dgn_region_list vaults = get_vault_regions();
```

Replacement in crawl-ref/source/dungeon.cc at line 2982 [6.3429798]

B:BD[9.7586] → [9.7586:7656]

        const coord_def floor = find_random_grid(DNGN_FLOOR, vaults);

[9.7586]

[9.7656]

        const coord_def floor = find_random_grid(DNGN_FLOOR, MMT_VAULT);

Replacement in crawl-ref/source/dungeon.cc at line 2987 [6.3429798]
B:BD[9.7714] → [9.7714:7761]
```
        join_the_dots(p, floor, vaults, true);
```
[9.7714]
[9.7761]
```
        join_the_dots(p, floor, MMT_VAULT, true);
```

Replacement in crawl-ref/source/dungeon.cc at line 3058 [6.3429798]

B:BD[6.3599495] → [22.488:593]

B:BD[22.593] → [29.5940:5985]

∅:D[29.5985] → [30.1692:1728]

B:BD[5.1640] → [30.1692:1728]

B:BD[30.1728] → [20.2522:2672]

∅:D[20.2672] → [21.118667:118741]

B:BD[30.1728] → [21.118667:118741]

B:BD[21.118741] → [29.5986:6030]

∅:D[29.6030] → [21.118786:118825]

B:BD[21.118786] → [21.118786:118825]

∅:D[21.118825] → [30.1728:1801]

B:BD[30.1728] → [30.1728:1801]

    no_door_fixup_zones.push_back(
        dgn_region( place.x, place.y, place.width, place.height ) );
    if (place.map.has_tag("no_monster_gen"))
        no_monster_zones.push_back(
            dgn_region( place.x, place.y, place.width, place.height ) );
    if (place.map.has_tag("no_item_gen"))
        no_item_zones.push_back( 
            dgn_region( place.x, place.y, place.width, place.height ) );
    if (place.map.has_tag("no_pool_fixup"))
        no_pool_fixup_zones.push_back(
            dgn_region( place.x, place.y, place.width, place.height ) );

[6.3599495]

[5.1737]

    apply_place_masks(place);

Replacement in crawl-ref/source/dungeon.cc at line 3628 [6.3429798]

B:BD[32.11907] → [18.2783:2851]

    dungeon_feature_type feature, const dgn_region_list &forbidden)

[32.11907]

[6.3611810]

    dungeon_feature_type feature, unsigned mapmask)

Replacement in crawl-ref/source/dungeon.cc at line 3633 [6.3429798]

B:BD[6.3611881] → [18.2852:2933]

            if (grd[x][y] == replace && unforbidden(coord_def(x, y), forbidden))

[6.3611881]

[6.3611919]

            if (grd[x][y] == replace && unforbidden(coord_def(x, y), mapmask))

Replacement in crawl-ref/source/dungeon.cc at line 3638 [6.3429798]

B:BD[15.155625] → [5.1739:1810]

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

[15.155625]

[6.3612211]

bool unforbidden(const coord_def &c, unsigned mask)

Replacement in crawl-ref/source/dungeon.cc at line 3640 [6.3429798]

B:BD[6.3612213] → [15.155704:155896]

    for (dgn_region_list::const_iterator i = forbidden.begin();
         i != forbidden.end(); ++i)
    {
        if (i->contains(c))
            return (false);
    }
    
    return (true);

[6.3612213]

[15.155896]

    return (!mask || !(dgn_map_mask(c) & mask));

Replacement in crawl-ref/source/dungeon.cc at line 3646 [6.3429798]
B:BD[15.155978] → [9.9827:9865]
```
    const dgn_region_list &forbidden,
```
[15.155978]
[9.9865]
```
    unsigned mapmask,
```

Replacement in crawl-ref/source/dungeon.cc at line 3668 [6.3429798]

B:BD[15.156136] → [15.156136:156202]

            && unforbidden(coord_def(at.x + 1, at.y), forbidden))

[15.156136]

[6.3612654]

            && unforbidden(coord_def(at.x + 1, at.y), mapmask))

Replacement in crawl-ref/source/dungeon.cc at line 3675 [6.3429798]

B:BD[15.156270] → [15.156270:156336]

            && unforbidden(coord_def(at.x - 1, at.y), forbidden))

[15.156270]

[6.3612904]

            && unforbidden(coord_def(at.x - 1, at.y), mapmask))

Replacement in crawl-ref/source/dungeon.cc at line 3682 [6.3429798]

B:BD[15.156404] → [15.156404:156470]

            && unforbidden(coord_def(at.x, at.y - 1), forbidden))

[15.156404]

[6.3613154]

            && unforbidden(coord_def(at.x, at.y - 1), mapmask))

Replacement in crawl-ref/source/dungeon.cc at line 3689 [6.3429798]

B:BD[15.156538] → [15.156538:156604]

            && unforbidden(coord_def(at.x, at.y + 1), forbidden))

[15.156538]

[6.3613404]

            && unforbidden(coord_def(at.x, at.y + 1), mapmask))

Replacement in crawl-ref/source/dungeon.cc at line 4418 [6.3429798]

B:BD[15.157150] → [15.157150:157198]

                           dgn_region_list() );

[15.157150]

[6.3654089]

                           MMT_VAULT );

Replacement in crawl-ref/source/dungeon.cc at line 4449 [6.3429798]

B:BD[15.157541] → [15.157541:157593]

                               dgn_region_list() );

[15.157541]

[6.3655015]

                               MMT_VAULT );

Replacement in crawl-ref/source/dungeon.cc at line 4566 [6.3429798]
B:BD[15.157763] → [15.157763:157796]
```
            dgn_region_list() );
```
[15.157763]
[6.3659023]
```
            MMT_VAULT );
```

Replacement in crawl-ref/source/dungeon.cc at line 4846 [6.3429798]

B:BD[33.769] → [33.769:840]

                                     const dgn_region_list &forbidden,

[33.769]

[33.840]

                                     unsigned mmask,

Replacement in crawl-ref/source/dungeon.cc at line 4859 [6.3429798]

B:BD[33.1224] → [33.1224:1286]

            if (grd(c) != wall || !unforbidden(c, forbidden))

[33.1224]

[33.1286]

            if (grd(c) != wall || !unforbidden(c, mmask))

Deletion in crawl-ref/source/dungeon.cc at line 4891 [6.3429798]

B:BD[33.2422] → [33.2422:2493]

                                     const dgn_region_list &forbidden,

Replacement in crawl-ref/source/dungeon.cc at line 4909 [6.3429798]

B:BD[33.2950] → [33.2950:3028]

    change_walls_from_centre(region, c, rectangular, forbidden, wall, ldist);

[33.2950]

[34.2021]

    change_walls_from_centre(region, c, rectangular, MMT_VAULT, wall, ldist);

Replacement in crawl-ref/source/dungeon.cc at line 4987 [6.3429798]

B:BD[18.5651] → [23.1202:1277]

    change_walls_from_centre(lab, end, false, vault_zones, DNGN_ROCK_WALL,

[18.5651]

[33.3366]

    change_walls_from_centre(lab, end, false,
                             DNGN_ROCK_WALL,

Deletion in crawl-ref/source/dungeon.cc at line 4999 [6.3429798]

B:BD[18.5916] → [18.5916:5934]

∅:D[18.5934] → [35.4220:4252]

B:BD[35.4220] → [35.4220:4252]

∅:D[35.4252] → [6.3662710:3665073]

B:BD[6.3662710] → [6.3662710:3665073]

B:BD[6.3665073] → [36.4677:4754]

∅:D[36.4754] → [6.3665100:3665101]

∅:D[8.972390] → [6.3665100:3665101]

B:BD[6.3665100] → [6.3665100:3665101]

B:BD[6.3665175] → [6.3665175:3665263]

B:BD[6.3665263] → [8.972391:972428]

∅:D[8.972428] → [6.3665296:3665926]

B:BD[6.3665296] → [6.3665296:3665926]

B:BD[6.3665926] → [8.972429:972500]

B:BD[8.972500] → [37.54028:54112]

∅:D[37.54112] → [6.3666043:3666298]

∅:D[8.972566] → [6.3666043:3666298]

B:BD[6.3666043] → [6.3666043:3666298]

    link_items();
    
#ifdef OBSOLETE_LABYRINTH
    int keep_lx = 0, keep_ly = 0;
    int keep_lx2 = 0, keep_ly2 = 0;
    char start_point_x = 10;
    char start_point_y = 10;
    char going_x = 1;
    char going_y = (coinflip() ? 0 : 1);
    bool do_2 = false;
    int clear_space = 1;
    unsigned char traps_put2 = 0;
    if (coinflip())
    {
        start_point_x = (GXM - 10);
        going_x = -1;
    }
    if (coinflip())
    {
        start_point_y = (GYM - 10);
        if (going_y == 1)
            going_y = -1;
    }
    int lx = start_point_x;
    int ly = start_point_y;
    if (going_y)
        goto do_y;
  do_x:
    traps_put2 = 0;
    clear_space = 0;            // ( coinflip()? 3 : 2 );
    do
    {
        lx += going_x;
        if (grd[lx][ly] == DNGN_ROCK_WALL)
            grd[lx][ly] = DNGN_FLOOR;
    }
    while (lx < (GXM - 8) && lx > 8
           && grd[lx + going_x * (2 + clear_space)][ly] == DNGN_ROCK_WALL);
    going_x = 0;
    if (ly < 32)
        going_y = 1;
    else if (ly > 37)
        going_y = -1;
    else
        goto finishing;
  do_y:                 // if (going_y != 0)
    if (do_2)
    {
        lx = keep_lx2;
        ly = keep_ly2;
    }
    // do_2 = false is the problem
    if (coinflip())
    {
        clear_space = 0;
        do_2 = false;
    }
    else
    {
        clear_space = 2;
        do_2 = true;
    }
    do
    {
        ly += going_y;
        if (grd[lx][ly] == DNGN_ROCK_WALL)
            grd[lx][ly] = DNGN_FLOOR;
    }
    while (ly < (GYM - 8) && ly > 8
           && grd[lx][ly + going_y * (2 + clear_space)] == DNGN_ROCK_WALL);
    keep_lx = lx;
    keep_ly = ly;
    if (lx < 37)
        going_x = 1;
    else if (lx > 42)
        going_x = -1;
    if (ly < 33)
        ly += 2;
    else if (ly > 37)
        ly -= 2;
    clear_space = ((!do_2) ? 6 : 2);
    do
    {
        lx += going_x;
        if (grd[lx][ly] == DNGN_ROCK_WALL)
            grd[lx][ly] = DNGN_FLOOR;
    }
    while (lx < (GXM - 8) && lx > 8
           && grd[lx + going_x * (2 + clear_space)][ly] == DNGN_ROCK_WALL);
    if (do_2)
    {
        keep_lx2 = lx;
        keep_ly2 = ly;
    }
    lx = keep_lx;
    ly = keep_ly;
    going_y = 0;
    if (lx < 37)
        going_x = 1;
    else if (lx > 42)
        going_x = -1;
    else
        goto finishing;
    goto do_x;
  finishing:
    start_point_x = 10 + random2(GXM - 20);
    object_class_type glopop = OBJ_RANDOM;  // used in calling items() {dlb}
    int num_items = 8 + random2avg(9, 2);
    for (int i = 0; i < num_items; i++)
    {
        int temp_rand = random2(11);
        glopop = ((temp_rand == 0 || temp_rand == 9)  ? OBJ_WEAPONS :
                  (temp_rand == 1 || temp_rand == 10) ? OBJ_ARMOUR :
                  (temp_rand == 2)                    ? OBJ_MISSILES :
                  (temp_rand == 3)                    ? OBJ_WANDS :
                  (temp_rand == 4)                    ? OBJ_MISCELLANY :
                  (temp_rand == 5)                    ? OBJ_SCROLLS :
                  (temp_rand == 6)                    ? OBJ_JEWELLERY :
                  (temp_rand == 7)                    ? OBJ_BOOKS
                  /* (temp_rand == 8) */              : OBJ_STAVES);
        const int treasure_item = items( 1, glopop, OBJ_RANDOM, true, 
                                         level_number * 3, MAKE_ITEM_RANDOM_RACE );
        if (treasure_item != NON_ITEM)
        {
            mitm[treasure_item].x = lx;
            mitm[treasure_item].y = ly;
        }
    }
    mons_place( MONS_MINOTAUR, BEH_SLEEP, MHITNOT, true, lx, ly );
    grd[lx][ly] = DNGN_ROCK_STAIRS_UP;

Deletion in crawl-ref/source/dungeon.cc at line 5000 [6.3429798]
B:BD[6.3666316] → [6.3666316:3666372]
B:BD[6.3666372] → [32.13348:13481]
∅:D[32.13481] → [6.3666558:3666620]
∅:D[8.972727] → [6.3666558:3666620]
B:BD[6.3666558] → [6.3666558:3666620]
B:BD[6.3666620] → [35.4253:4260]
```
    // turn rock walls into undiggable stone or metal:
    dungeon_feature_type wall_xform =
        ((random2(50) > 10) ? DNGN_STONE_WALL   // 78.0%
         : DNGN_METAL_WALL); // 22.0%
    replace_area(0,0,GXM-1,GYM-1,DNGN_ROCK_WALL,wall_xform);
#endif
```

Insertion in crawl-ref/source/dungeon.cc at line 6070 [6.3429798]

[15.158720]

bool dgn_region::overlaps(const dgn_region_list &regions,
                          const map_mask &mask) const
{
    return overlaps_any(regions) && overlaps(mask);
}
bool dgn_region::overlaps(const map_mask &mask) const
{
    const coord_def endp = pos + size;
    for (int y = pos.y; y < endp.y; ++y)
        for (int x = pos.x; x < endp.x; ++x)
            if (mask[x][y])
                return (true);
    return (false);
}

Replacement in crawl-ref/source/dat/entry.des at line 18 [38.591]

B:BD[38.1237] → [38.1237:1381]

xxxxxx.@.xxxxxx
xxxxxx.!.xxxxxx
xxxxxx...xxxxxx
xxxxxx.!.xxxxxx
xxxxxx...xxxxxx
xxxxxx.!.xxxxxx
xxxxxx...xxxxxx
xxxxxx.!.xxxxxx
xxxxxx...xxxxxx

[38.1237]

[38.1381]

     x.@.x
     x.!.x
     x...x
     x.!.x
     x...x
     x.!.x
     x...x
     x.!.x
     x...x

Replacement in crawl-ref/source/dat/entry.des at line 45 [38.591]

B:BD[38.1701] → [38.1701:1781]

......x@x......
....xax.xcx....
...xx.....xx...
..xb.......bx..
.xx.........xx.

[38.1701]

[38.1781]

      x@x
    xax.xcx
   xx.....xx
  xb.......bx
 xx.........xx

Replacement in crawl-ref/source/dat/entry.des at line 57 [38.591]

B:BD[38.1893] → [38.1893:1989]

.xc.........bx.
..xx.......xx..
...xa.....xc...
....xx...xx....
.....bx.xa.....
......x@x......

[38.1893]

[38.1989]

 xc.........bx
  xx.......xx
   xa.....xc
    xx...xx
     bx.xa
      x@x

Replacement in crawl-ref/source/dat/entry.des at line 73 [38.591]

B:BD[38.2161] → [38.2161:2211]

xxxxxxxxx
xxxxxxx{x
xxxxxxx.x
xxxxxxx.x
xxxxxxx.x

[38.2161]

[38.2211]

      xxx
      x{x
      x.x
      x.x
      x.x

Replacement in crawl-ref/source/dat/entry.des at line 81 [38.591]

B:BD[38.2259] → [38.2259:2342]

xxxxxxx.x
xxxxxxx.x
xxxxxxx.x
xxxxxxx.xx
xxxxxxG.Gx
xxxxxxx.xx
xxxxxxx.x
xxxxxxx@x

[38.2259]

[38.2342]

      x.x
      x.x
      x.x
     xx.xx
     xG.Gx
     xx.xx
      x.x
      x@x

Deletion in crawl-ref/source/dat/entry.des at line 90 [38.591]
B:BD[38.2349] → [38.2349:2395]
```
# padded to the right with 'x', unfortunately
```

Replacement in crawl-ref/source/dat/entry.des at line 184 [38.591]

B:BD[38.4259] → [38.4259:4369]

xxxxxxxxxxxxxxxxxxx  
x{xxxxxxxxxxxxxxxxx  
x..xxxxxxxxxxxx[x?x  
xx.?xxxxx(xxxx?...x  
x?..xxxx..xxxx???.x

[38.4259]

[38.4369]

xxx
x{xx          xxxxx  
x..xx   xxx  xx[x?x  
xx.?xxxxx(x  x?...x  
x?..xxxx..x xx???.x

Replacement in crawl-ref/source/dat/entry.des at line 193 [38.591]

B:BD[38.4457] → [38.4457:4655]

xxx...?x??x..xxxxxx  
xxxxx.xx....xxxxxxx  
xxxxx..x.??xxxxxxxx  
xxxxxx.?.xxxxxxxxxx  
xxxxxx..??xxxxxxxxx  
xxxxxx?x.xxxxxxxxxx  
xxxxxxx?.?xxxxxxxxx  
xxxxxxxx..?xxxxxxxx  
xxxxxxxxxx@xxxxxxxx

[38.4457]

[3.2229]

 xx...?x??x..xx
  xxx.xx....xx
    x..x.??xx
    xx.?.xxx
     x..??x
     x?x.xx
     xx?.?xx
      xx..?x
       xxx@x

Replacement in crawl-ref/source/dat/entry.des at line 216 [38.591]

B:BD[38.4928] → [38.4928:5120]

xx...ccccc...xx
xxx...ccc...xxx
xxx...ccc...xxx
xxxx...c...xxxx
xxxx...c...xxxx
xxxxx.....xxxxx
xxxxx.....xxxxx
xxxxxx...xxxxxx
xxxxxx...xxxxxx
xxxxxx...xxxxxx
xxxxxx+++xxxxxx
xxxxxx.@.xxxxxx

[38.4928]

[38.5120]

 x...ccccc...x
 xx...ccc...xx
  x...ccc...x
  xx...c...xx
   x...c...x
   xx.....xx
    x.....x
    xx...xx
     x...x
     x...x
     x+++x
     x.@.x

Insertion in crawl-ref/source/cio.h at line 209 [39.10469]
[39.15277]
[39.15277]
```
    void kill_to_begin();
```

Insertion in crawl-ref/source/cio.cc at line 388 [39.15671]

[39.23966]


void line_reader::kill_to_begin()
{
    if (!pos || cur == buffer)
        return;

Insertion in crawl-ref/source/cio.cc at line 394 [39.15671]

[39.23967]

    buffer[length] = 0;
    cursorto(0);
    wrapcprintf(wrapcol, "%s%*s", cur, cur - buffer, "");
    memmove(buffer, cur, length - pos);
    length -= pos;
    pos = 0;
    cur = buffer;
    cursorto(pos);
}

Insertion in crawl-ref/source/cio.cc at line 501 [39.15671]

[39.25995]

    case CONTROL('U'):
        kill_to_begin();
        break;

Extend rectangular vault support for regular vaults.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/monplace.h at line 84 [6.1638277]

Replacement in crawl-ref/source/monplace.cc at line 147 [6.1641732]

Replacement in crawl-ref/source/monplace.cc at line 318 [6.1641732]

Replacement in crawl-ref/source/maps.cc at line 195 [6.2007666]

Insertion in crawl-ref/source/mapdef.h at line 179 [8.591249]

Insertion in crawl-ref/source/mapdef.h at line 505 [8.591249]

Insertion in crawl-ref/source/mapdef.cc at line 362 [8.594797]

Insertion in crawl-ref/source/mapdef.cc at line 1112 [8.594797]

Replacement in crawl-ref/source/makeitem.h at line 15 [11.516]

Replacement in crawl-ref/source/makeitem.cc at line 858 [11.927]

Replacement in crawl-ref/source/makeitem.cc at line 2867 [11.927]

Replacement in crawl-ref/source/luadgn.h at line 37 [14.228]

Replacement in crawl-ref/source/luadgn.cc at line 230 [14.1232]

Insertion in crawl-ref/source/luadgn.cc at line 239 [14.1232]

Deletion in crawl-ref/source/luadgn.cc at line 243 [14.1232]

Replacement in crawl-ref/source/luadgn.cc at line 250 [14.1232]

Replacement in crawl-ref/source/luadgn.cc at line 256 [14.1232]

Insertion in crawl-ref/source/dungeon.h at line 18 [6.3428186]

Insertion in crawl-ref/source/dungeon.h at line 33 [6.3428186]

Insertion in crawl-ref/source/dungeon.h at line 35 [6.3428186]

Insertion in crawl-ref/source/dungeon.h at line 108 [6.3428186]

Replacement in crawl-ref/source/dungeon.h at line 119 [6.3428186]

Replacement in crawl-ref/source/dungeon.h at line 174 [6.3428186]

Replacement in crawl-ref/source/dungeon.h at line 188 [6.3428186]

Replacement in crawl-ref/source/dungeon.h at line 197 [6.3428186]

Replacement in crawl-ref/source/dungeon.h at line 214 [6.3428186]

Replacement in crawl-ref/source/dungeon.h at line 217 [6.3428186]

Replacement in crawl-ref/source/dungeon.h at line 314 [6.3428186]