fiddlerwoaroof/crawl - Change KTRWLM6WDL4GAAJZNLQEEA3TGY2OKYZZUAAT4TCAVKRTR2NQBWUQC

Clean up legacy cruft involved in placing vaults.

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

Created by dshaligram on November 23, 2008

KTRWLM6WDL4GAAJZNLQEEA3TGY2OKYZZUAAT4TCAVKRTR2NQBWUQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/maps.h at line 28 [4.2007036]

[3.332]

[4.2007312]


    int level_number, altar_count, num_runes;
    // If we're not placing runes, this is the substitute feature.
    int rune_subst;

Replacement in crawl-ref/source/maps.h at line 36 [4.2007036]
∅:D[5.320] → [3.385:403]
∅:D[6.1910] → [3.385:403]
B:BD[3.385] → [3.385:403]
```
          exits()
```
[5.320]
[7.582950]
```
          exits(), level_number(0), altar_count(0), num_runes(0),
          rune_subst(-1)
```

Replacement in crawl-ref/source/maps.cc at line 164 [4.2007666]

B:BD[8.328] → [8.328:439]

B:BD[8.439] → [9.1648:1706]

static bool bad_map_place(const map_def &map,
                          int sx, int sy, int width, int height,
                          bool check_place, bool clobber)

[8.328]

[3.1428]

static bool bad_map_place(const map_def &map, const coord_def &c,
                          const coord_def &size)

Deletion in crawl-ref/source/maps.cc at line 167 [4.2007666]
B:BD[3.1430] → [10.3152:3185]
∅:D[11.623] → [8.519:543]
∅:D[10.3185] → [8.519:543]
B:BD[8.519] → [8.519:543]
B:BD[8.543] → [12.12495:12496]
```
    if (!check_place || clobber)
        return (false);
```
Replacement in crawl-ref/source/maps.cc at line 168 [4.2007666]
∅:D[13.524] → [3.1430:1473]
B:BD[3.1430] → [3.1430:1473]
```
    for (int y = sy; y < sy + height; ++y)
```
[13.524]
[3.1473]
```
    for (rectangle_iterator r(c, c + size - 1); r; ++r)
```

Replacement in crawl-ref/source/maps.cc at line 170 [4.2007666]

B:BD[3.1479] → [3.1479:1535]

B:BD[3.1535] → [13.525:597]

        for (int x = sx; x < sx + width; ++x)
        {
            if (lines[y - sy][x - sx] == ' ')
                continue;

[3.1479]

[8.549]

        const coord_def &p(*r);
        const coord_def dp = p - c;
        if (lines[dp.y][dp.x] == ' ')
            continue;

Replacement in crawl-ref/source/maps.cc at line 175 [4.2007666]

B:BD[8.550] → [14.2584:2620]

∅:D[14.2620] → [8.586:617]

B:BD[8.586] → [8.586:617]

            if (dgn_Map_Mask[x][y])
                return (true);

[8.550]

[11.624]

        if (dgn_Map_Mask[p.x][p.y])
            return (true);

Replacement in crawl-ref/source/maps.cc at line 178 [4.2007666]

B:BD[11.625] → [10.3186:3255]

∅:D[9.1806] → [11.694:725]

∅:D[10.3255] → [11.694:725]

B:BD[11.694] → [11.694:725]

            if (igrd[x][y] != NON_ITEM || mgrd[x][y] != NON_MONSTER)
                return (true);

[11.625]

[12.12497]

        if (igrd(p) != NON_ITEM || mgrd(p) != NON_MONSTER)
            return (true);

Replacement in crawl-ref/source/maps.cc at line 181 [4.2007666]
∅:D[13.610] → [15.6899:6956]
∅:D[12.12498] → [15.6899:6956]
B:BD[3.1535] → [15.6899:6956]
```
            const dungeon_feature_type grid = grd[x][y];
```
[12.12498]
[3.1569]
```
        const dungeon_feature_type grid = grd(p);
```

Replacement in crawl-ref/source/maps.cc at line 183 [4.2007666]

B:BD[3.1570] → [3.1570:1646]

B:BD[3.1646] → [16.2594:2640]

∅:D[17.173] → [3.1646:1791]

∅:D[16.2640] → [3.1646:1791]

B:BD[3.1646] → [3.1646:1791]

            if (!grid_is_opaque(grid)
                && grid != DNGN_FLOOR
                && grid != DNGN_SHALLOW_WATER
                && grid != DNGN_CLOSED_DOOR
                && grid != DNGN_OPEN_DOOR
                && grid != DNGN_SECRET_DOOR)
            {

[3.1570]

[9.1807]

        if (!grid_is_opaque(grid)
            && grid != DNGN_FLOOR
            && grid != DNGN_SHALLOW_WATER
            && grid != DNGN_CLOSED_DOOR
            && grid != DNGN_OPEN_DOOR
            && grid != DNGN_SECRET_DOOR)
        {

Replacement in crawl-ref/source/maps.cc at line 191 [4.2007666]

B:BD[9.1832] → [9.1832:1993]

                mprf(MSGCH_DIAGNOSTICS,
                     "Rejecting place because of %s at (%d,%d)",
                     dungeon_feature_name(grid), x, y);

[9.1832]

[9.1993]

            mprf(MSGCH_DIAGNOSTICS,
                 "Rejecting place because of %s at (%d,%d)",
                 dungeon_feature_name(grid), p.x, p.y);

Replacement in crawl-ref/source/maps.cc at line 195 [4.2007666]
∅:D[9.2000] → [3.1791:1836]
B:BD[3.1791] → [3.1791:1836]
```
                return (true);
            }
```
[9.2000]
[3.1836]
```
            return (true);
```
Replacement in crawl-ref/source/maps.cc at line 221 [4.2007666]
B:BD[7.586290] → [7.586290:586360]
```
    const int width = ml.width();
    const int height = ml.height();
```
[7.586290]
[4.2161852]
```
    const coord_def size(ml.size());
```
Replacement in crawl-ref/source/maps.cc at line 227 [4.2007666]
B:BD[7.586449] → [7.586449:586489]
```
            || orient == MAP_SOUTHWEST)
```
[7.586449]
[18.4787]
```
        || orient == MAP_SOUTHWEST)
```
Replacement in crawl-ref/source/maps.cc at line 229 [4.2007666]
∅:D[18.4793] → [5.1055:1087]
B:BD[7.586489] → [5.1055:1087]
```
        start.y = GYM - height;
```
[18.4793]
[18.4794]
```
        start.y = GYM - size.y;
```
Replacement in crawl-ref/source/maps.cc at line 232 [4.2007666]
∅:D[12.12611] → [7.586576:586616]
B:BD[7.586576] → [7.586576:586616]
```
            || orient == MAP_SOUTHEAST)
```
[12.12611]
[18.4801]
```
        || orient == MAP_SOUTHEAST)
```
Replacement in crawl-ref/source/maps.cc at line 234 [4.2007666]
∅:D[18.4807] → [5.1088:1119]
B:BD[7.586616] → [5.1088:1119]
```
        start.x = GXM - width;
```
[18.4807]
[18.4808]
```
        start.x = GXM - size.x;
```

Replacement in crawl-ref/source/maps.cc at line 240 [4.2007666]

B:BD[7.586804] → [7.586804:586876]

                || orient == MAP_ENCOMPASS)
            && width < GXM)

[7.586804]

[18.4815]

         || orient == MAP_ENCOMPASS)
        && size.x < GXM)

Replacement in crawl-ref/source/maps.cc at line 243 [4.2007666]
∅:D[18.4821] → [5.1120:1157]
B:BD[7.586876] → [5.1120:1157]
```
        start.x = (GXM - width) / 2;
```
[18.4821]
[18.4822]
```
        start.x = (GXM - size.x) / 2;
```

Replacement in crawl-ref/source/maps.cc at line 246 [4.2007666]

B:BD[7.586963] → [7.586963:587036]

                || orient == MAP_ENCOMPASS)
            && height < GYM)

[7.586963]

[18.4829]

         || orient == MAP_ENCOMPASS)
        && size.y < GYM)

Replacement in crawl-ref/source/maps.cc at line 249 [4.2007666]
∅:D[18.4835] → [5.1158:1196]
B:BD[7.587036] → [5.1158:1196]
```
        start.y = (GYM - height) / 2;
```
[18.4835]
[18.4836]
```
        start.y = (GYM - size.y) / 2;
```

Replacement in crawl-ref/source/maps.cc at line 257 [4.2007666]

B:BD[5.1242] → [5.1242:1377]

            start = place.pos - coord_def(width, height) / 2;
            fit_region_into_map_bounds(start, coord_def(width, height));

[5.1242]

[5.1377]

            start = place.pos - size / 2;
            fit_region_into_map_bounds(start, size);

Replacement in crawl-ref/source/maps.cc at line 264 [4.2007666]

B:BD[3.2709] → [5.1440:1513]

∅:D[5.1513] → [9.2134:2166]

B:BD[9.2134] → [9.2134:2166]

    if (bad_map_place(def, start.x, start.y, width, height, check_place,
                      clobber))

[3.2709]

[3.2770]

    if (check_place && !clobber && bad_map_place(def, start, size))

Replacement in crawl-ref/source/maps.cc at line 268 [4.2007666]

B:BD[3.2873] → [5.1514:1561]

             start.x, start.y, width, height);

[3.2873]

[3.2918]

             start.x, start.y, size.x, size.y);

Replacement in crawl-ref/source/maps.cc at line 276 [4.2007666]

B:BD[7.587233] → [5.1562:1626]

            def.name.c_str(), start.x, start.y, width, height);

[7.587233]

[7.587295]

            def.name.c_str(), start.x, start.y, size.x, size.y);

Replacement in crawl-ref/source/maps.cc at line 279 [4.2007666]
B:BD[4.2169534] → [5.1627:1680]
```
    for (int y = start.y; y < start.y + height; ++y)
```
[4.2169534]
[7.587354]
```
    for (int y = start.y; y < start.y + size.y; ++y)
```
Replacement in crawl-ref/source/maps.cc at line 286 [4.2007666]
B:BD[5.1815] → [5.1815:1858]
```
    place.size = coord_def(width, height);
```
[5.1815]
[3.2950]
```
    place.size = size;
```
Insertion in crawl-ref/source/mapdef.h at line 260 [7.591249]
[7.592369]
[7.592369]
```
    coord_def size() const;
```

Replacement in crawl-ref/source/mapdef.cc at line 365 [7.594797]

B:BD[19.6490] → [19.6490:6545]

    for (int i = 0, size = vect.size(); i < size; ++i)

[19.6490]

[19.6545]

    for (int i = 0, vsize = vect.size(); i < vsize; ++i)

Replacement in crawl-ref/source/mapdef.cc at line 406 [7.594797]

B:BD[7.595830] → [19.7325:7383]

    for (int i = 0, size = markers.size(); i < size; ++i)

[7.595830]

[19.7383]

    for (int i = 0, vsize = markers.size(); i < vsize; ++i)

Replacement in crawl-ref/source/mapdef.cc at line 463 [7.594797]
∅:D[20.3319] → [21.1978:2033]
B:BD[21.1978] → [21.1978:2033]
```
    for (int i = 1, size = segs.size(); i < size; ++i)
```
[20.3319]
[21.2033]
```
    for (int i = 1, vsize = segs.size(); i < vsize; ++i)
```

Replacement in crawl-ref/source/mapdef.cc at line 491 [7.594797]

B:BD[21.2712] → [21.2712:2767]

    for (int i = 0, size = segs.size(); i < size; ++i)

[21.2712]

[21.2767]

    for (int i = 0, vsize = segs.size(); i < vsize; ++i)

Replacement in crawl-ref/source/mapdef.cc at line 517 [7.594797]

B:BD[22.3133] → [22.3133:3193]

    for (int i = 0, size = cspeclist.size(); i < size; ++i)

[22.3133]

[22.3193]

    for (int i = 0, vsize = cspeclist.size(); i < vsize; ++i)

Replacement in crawl-ref/source/mapdef.cc at line 630 [7.594797]

B:BD[23.3574] → [23.3574:3629]

    for (int i = 0, size = segs.size(); i < size; ++i)

[23.3574]

[23.3629]

    for (int i = 0, vsize = segs.size(); i < vsize; ++i)

Replacement in crawl-ref/source/mapdef.cc at line 636 [7.594797]
B:BD[23.3776] → [23.3776:3806]
```
            if (i < size - 1)
```
[23.3776]
[23.3806]
```
            if (i < vsize - 1)
```

Replacement in crawl-ref/source/mapdef.cc at line 671 [7.594797]

B:BD[24.10096] → [24.10096:10161]

        for (int i = 0, size = transforms.size(); i < size; ++i)

[24.10096]

[24.10161]

        for (int i = 0, vsize = transforms.size(); i < vsize; ++i)

Replacement in crawl-ref/source/mapdef.cc at line 699 [7.594797]

B:BD[24.10986] → [24.10986:11051]

        for (int i = 0, size = transforms.size(); i < size; ++i)

[24.10986]

[24.11051]

        for (int i = 0, vsize = transforms.size(); i < vsize; ++i)

Insertion in crawl-ref/source/mapdef.cc at line 757 [7.594797]
[25.140763]
[25.140763]
```
coord_def map_lines::size() const
{
    return coord_def(width(), height());
}
```

Replacement in crawl-ref/source/mapdef.cc at line 869 [7.594797]

B:BD[23.4709] → [23.4709:4788]

    for (int i = 0, size = spec.specs.size(); i < size && pcount < psize; ++i)

[23.4709]

[23.4788]

    for (int i = 0, vsize = spec.specs.size();
         i < vsize && pcount < psize; ++i)

Replacement in crawl-ref/source/mapdef.cc at line 928 [7.594797]
∅:D[26.1271] → [27.123321:123377]
∅:D[20.3391] → [27.123321:123377]
B:BD[7.596836] → [27.123321:123377]
```
    for (int i = 0, size = lines.size(); i < size; ++i)
```
[20.3391]
[27.123377]
```
    for (int i = 0, vsize = lines.size(); i < vsize; ++i)
```
Replacement in crawl-ref/source/mapdef.cc at line 945 [7.594797]
∅:D[19.7688] → [28.2647:2708]
B:BD[27.123754] → [28.2647:2708]
```
    for (int i = 0, size = transforms.size(); i < size; ++i)
```
[19.7688]
[19.7689]
```
    for (int i = 0, vsize = transforms.size(); i < vsize; ++i)
```

Replacement in crawl-ref/source/mapdef.cc at line 959 [7.594797]

B:BD[7.596877] → [7.596877:596933]

    for (int i = 0, size = lines.size(); i < size; ++i)

[7.596877]

[7.596933]

    for (int i = 0, vsize = lines.size(); i < vsize; ++i)

Replacement in crawl-ref/source/mapdef.cc at line 1014 [7.594797]

B:BD[19.8040] → [19.8040:8098]

    for (int i = 0, size = markers.size(); i < size; ++i)

[19.8040]

[19.8098]

    for (int i = 0, vsize = markers.size(); i < vsize; ++i)

Replacement in crawl-ref/source/mapdef.cc at line 1054 [7.594797]

B:BD[7.597926] → [7.597926:597996]

    const int size = lines.size();
    const int midpoint = size / 2;

[7.597926]

[7.597996]

    const int vsize = lines.size();
    const int midpoint = vsize / 2;

Replacement in crawl-ref/source/mapdef.cc at line 1060 [7.594797]

B:BD[7.598079] → [7.598079:598155]

        lines[i] = lines[size - 1 - i];
        lines[size - 1 - i] = temp;

[7.598079]

[29.622]

        lines[i] = lines[vsize - 1 - i];
        lines[vsize - 1 - i] = temp;

Replacement in crawl-ref/source/mapdef.cc at line 1069 [7.594797]

B:BD[29.819] → [29.819:884]

                           (*colour_overlay)(j, size - 1 - i) );

[29.819]

[7.598155]

                           (*colour_overlay)(j, vsize - 1 - i) );

Replacement in crawl-ref/source/mapdef.cc at line 1079 [7.594797]

B:BD[7.598232] → [7.598232:598288]

    for (int i = 0, size = lines.size(); i < size; ++i)

[7.598232]

[7.598288]

    for (int i = 0, vsize = lines.size(); i < vsize; ++i)

Replacement in crawl-ref/source/mapdef.cc at line 1092 [7.594797]

B:BD[29.928] → [29.928:988]

        for (int i = 0, size = lines.size(); i < size; ++i)

[29.928]

[29.988]

        for (int i = 0, vsize = lines.size(); i < vsize; ++i)

Replacement in crawl-ref/source/mapdef.cc at line 1105 [7.594797]

B:BD[24.12058] → [24.12058:12119]

    for (int i = 0, size = transforms.size(); i < size; ++i)

[24.12058]

[24.12119]

    for (int i = 0, vsize = transforms.size(); i < vsize; ++i)

Replacement in crawl-ref/source/mapdef.cc at line 1114 [7.594797]

B:BD[24.12373] → [24.12373:12434]

    for (int i = 0, size = transforms.size(); i < size; ++i)

[24.12373]

[24.12434]

    for (int i = 0, vsize = transforms.size(); i < vsize; ++i)

Replacement in crawl-ref/source/dungeon.cc at line 213 [4.3429798]

B:BD[30.12187] → [30.12187:12230]

B:BD[30.12230] → [31.72742:72849]

∅:D[31.72849] → [30.12305:12532]

B:BD[30.12305] → [30.12305:12532]

static int _vault_grid( vault_placement &,
                        int level_number, const coord_def& where,
                        int altar_count,
                        FixedVector < object_class_type, 7 > &acq_item_class,
                        int vgrid, std::vector<coord_def> &targets,
                        int &num_runes, int rune_subst = -1, bool foll = false);

[30.12187]

[4.3435718]

static void _vault_grid( vault_placement &,
                         int vgrid,
                         const coord_def& where,
                         std::vector<coord_def> &targets,
                         bool recursive = false);

Deletion in crawl-ref/source/dungeon.cc at line 3939 [4.3429798]

∅:D[18.9441] → [4.3594195:3594221]

B:BD[4.3594195] → [4.3594195:3594221]

B:BD[4.3594221] → [32.4425:4482]

B:BD[4.3594383] → [4.3594383:3594644]

    int altar_count = 0;
    FixedVector < object_class_type, 7 > acq_item_class;
    acq_item_class[0] = OBJ_WEAPONS;
    acq_item_class[1] = OBJ_ARMOUR;
    acq_item_class[2] = OBJ_WEAPONS;
    acq_item_class[3] = OBJ_JEWELLERY;
    acq_item_class[4] = OBJ_BOOKS;
    acq_item_class[5] = OBJ_STAVES;
    acq_item_class[6] = OBJ_MISCELLANY;

Insertion in crawl-ref/source/dungeon.cc at line 3944 [4.3429798]
[7.967540]
[33.160]
```
    place.level_number = level_number;
```
Replacement in crawl-ref/source/dungeon.cc at line 3971 [4.3429798]
B:BD[12.14396] → [20.9052:9085]
∅:D[20.9085] → [4.3596844:3596867]
∅:D[25.149775] → [4.3596844:3596867]
B:BD[4.3596844] → [4.3596844:3596867]
```
    // These two are throwaways:
    int num_runes = 0;
```
[12.14396]
[34.454]
```
    // This is a throwaway.
```

Replacement in crawl-ref/source/dungeon.cc at line 3986 [4.3429798]

B:BD[31.81356] → [31.81356:81660]

        altar_count = _vault_grid( place,
                                   level_number, *ri,
                                   altar_count,
                                   acq_item_class,
                                   feat, target_connections,
                                   num_runes );

[31.81356]

[31.81660]

        _vault_grid( place, feat, *ri, target_connections );

Deletion in crawl-ref/source/dungeon.cc at line 4502 [4.3429798]
∅:D[18.9685] → [4.3597584:3597609]
B:BD[4.3597584] → [4.3597584:3597609]
```
    int altar_count = 0;
```

Deletion in crawl-ref/source/dungeon.cc at line 4505 [4.3429798]

B:BD[4.3597705] → [32.4483:4540]

B:BD[32.4540] → [20.9129:9259]

∅:D[20.9259] → [4.3597874:3598135]

B:BD[4.3597874] → [4.3597874:3598135]

    FixedVector < object_class_type, 7 > acq_item_class;
    // XXX: Hack - passing chars through '...' promotes them to ints,
    // which barfs under gcc in fixvec.h.  So don't. -- GDL
    acq_item_class[0] = OBJ_WEAPONS;
    acq_item_class[1] = OBJ_ARMOUR;
    acq_item_class[2] = OBJ_WEAPONS;
    acq_item_class[3] = OBJ_JEWELLERY;
    acq_item_class[4] = OBJ_BOOKS;
    acq_item_class[5] = OBJ_STAVES;
    acq_item_class[6] = OBJ_MISCELLANY;

Insertion in crawl-ref/source/dungeon.cc at line 4510 [4.3429798]
[7.968669]
[3.8322]
```
    place.level_number = level_number;
```
Deletion in crawl-ref/source/dungeon.cc at line 4523 [4.3429798]
B:BD[4.3598829] → [35.14552:14575]
∅:D[35.14575] → [4.3599020:3599021]
B:BD[4.3599020] → [4.3599020:3599021]
```
    int num_runes = 0;
```

Replacement in crawl-ref/source/dungeon.cc at line 4535 [4.3429798]

B:BD[36.8230] → [36.8230:8585]

            altar_count = _vault_grid( place, level_number, *ri, altar_count,
                                       acq_item_class,
                                       vgrid[ri->y][ri->x],
                                       target_connections,
                                       num_runes,
                                       rune_subst );

[36.8230]

[36.8585]

            _vault_grid( place, vgrid[ri->y][ri->x], *ri,
                         target_connections );

Replacement in crawl-ref/source/dungeon.cc at line 4893 [4.3429798]
B:BD[37.4296] → [37.4296:4333]
```
            int lev = monster_level;
```
[37.4296]
[37.4333]
```
            int lev = mspec.place.absdepth();
```
Deletion in crawl-ref/source/dungeon.cc at line 4895 [4.3429798]
B:BD[37.4334] → [37.4334:4391]
B:BD[37.4391] → [38.8770:8816]
∅:D[38.8816] → [37.4470:4471]
B:BD[37.4470] → [37.4470:4471]
```
            if (mspec.place.level_type == LEVEL_DUNGEON)
                lev = mspec.place.absdepth();
```

Insertion in crawl-ref/source/dungeon.cc at line 5043 [4.3429798]

[39.391]


static const object_class_type _acquirement_item_classes[] = {
    OBJ_WEAPONS,
    OBJ_ARMOUR,
    OBJ_WEAPONS,
    OBJ_JEWELLERY,
    OBJ_BOOKS,
    OBJ_STAVES,
    OBJ_MISCELLANY
};

Replacement in crawl-ref/source/dungeon.cc at line 5057 [4.3429798]

∅:D[20.9936] → [30.34632:34722]

B:BD[4.3605130] → [30.34632:34722]

B:BD[30.34722] → [31.83966:84014]

∅:D[31.84014] → [30.34762:35094]

B:BD[30.34762] → [30.34762:35094]

static int _vault_grid( vault_placement &place,
                        int level_number,
                        const coord_def& where,
                        int altar_count,
                        FixedVector < object_class_type, 7 > &acq_item_class,
                        int vgrid,
                        std::vector<coord_def> &targets,
                        int &num_runes,
                        int rune_subst,
                        bool following )

[20.9936]

[4.3605452]

static void _vault_grid( vault_placement &place,
                         int vgrid,
                         const coord_def& where,
                         std::vector<coord_def> &targets,
                         bool recursive )

Replacement in crawl-ref/source/dungeon.cc at line 5063 [4.3429798]
B:BD[4.3605454] → [20.9937:9982]
```
    keyed_mapspec *mapsp = (following ? NULL
```
[4.3605454]
[20.9982]
```
    keyed_mapspec *mapsp = (recursive ? NULL
```

Replacement in crawl-ref/source/dungeon.cc at line 5075 [4.3429798]

B:BD[40.11892] → [31.84086:84153]

∅:D[31.84153] → [30.35163:35358]

B:BD[30.35163] → [30.35163:35358]

            altar_count = _vault_grid( place, level_number, where,
                                       altar_count, acq_item_class,
                                       f.glyph, targets, num_runes,
                                       rune_subst, true );

[40.11892]

[40.12151]

            _vault_grid( place, f.glyph, where, targets, true );

Replacement in crawl-ref/source/dungeon.cc at line 5078 [4.3429798]

B:BD[40.12191] → [31.84154:84212]

            place_spec_shop(level_number, where, f.shop);

[40.12191]

[40.12250]

            place_spec_shop(place.level_number, where, f.shop);

Replacement in crawl-ref/source/dungeon.cc at line 5081 [4.3429798]

B:BD[40.12290] → [35.16128:16319]

            const trap_type trap
                = (f.trap == TRAP_INDEPTH) ? random_trap_for_place(level_number)
                                           : static_cast<trap_type>(f.trap);

[40.12290]

[12.14745]

            const trap_type trap =
                (f.trap == TRAP_INDEPTH)
                ? random_trap_for_place(place.level_number)
                : static_cast<trap_type>(f.trap);

Replacement in crawl-ref/source/dungeon.cc at line 5092 [4.3429798]

B:BD[41.1341] → [31.84298:84364]

        _dgn_place_one_monster(place, mons, level_number, where);

[41.1341]

[40.12642]

        _dgn_place_one_monster(place, mons, place.level_number, where);

Replacement in crawl-ref/source/dungeon.cc at line 5095 [4.3429798]

B:BD[42.1652] → [38.9006:9068]

        dgn_place_multiple_items(items, where, level_number);

[42.1652]

[40.12749]

        dgn_place_multiple_items(items, where, place.level_number);

Replacement in crawl-ref/source/dungeon.cc at line 5097 [4.3429798]
B:BD[40.12750] → [40.12750:12780]
```
        return (altar_count);
```
[40.12750]
[40.12780]
```
        return;
```

Replacement in crawl-ref/source/dungeon.cc at line 5133 [4.3429798]

B:BD[15.11665] → [43.3235:3308]

                       DNGN_ALTAR_FIRST_GOD + altar_count) :// see below

[15.11665]

[30.35566]

                       DNGN_ALTAR_FIRST_GOD + place.altar_count) :// see below

Replacement in crawl-ref/source/dungeon.cc at line 5149 [4.3429798]
B:BD[4.3607674] → [4.3607674:3607697]
```
        altar_count++;
```
[4.3607674]
[4.3607697]
```
        place.altar_count++;
```

Replacement in crawl-ref/source/dungeon.cc at line 5158 [4.3429798]

B:BD[44.118898] → [31.84645:84718]

        place_specific_trap(where, random_trap_for_place(level_number));

[44.118898]

[44.118972]

        place_specific_trap(where, random_trap_for_place(place.level_number));

Replacement in crawl-ref/source/dungeon.cc at line 5212 [4.3429798]

∅:D[12.14843] → [4.3609224:3609355]

B:BD[4.3609224] → [4.3609224:3609355]

                    || (vgrid == 'P' && (!possible_rune || num_runes > 0))
                    || (vgrid == 'O' && num_runes > 0))

[12.14843]

[4.3609355]

                    || (vgrid == 'P' && (!possible_rune || place.num_runes > 0))
                    || (vgrid == 'O' && place.num_runes > 0))

Replacement in crawl-ref/source/dungeon.cc at line 5215 [4.3429798]

B:BD[4.3609369] → [4.3609369:3609427]

                which_class = acq_item_class[random2(7)];

[4.3609369]

[4.3609427]

                which_class = RANDOM_ELEMENT(_acquirement_item_classes);

Replacement in crawl-ref/source/dungeon.cc at line 5220 [4.3429798]
B:BD[4.3609562] → [3.9662:9700]
```
                if (rune_subst != -1)
```
[4.3609562]
[3.9700]
```
                if (place.rune_subst != -1)
```

Replacement in crawl-ref/source/dungeon.cc at line 5222 [4.3429798]

B:BD[3.9718] → [31.84934:85014]

                    grd(where) = static_cast<dungeon_feature_type>(rune_subst);

[3.9718]

[3.9764]

                    grd(where) =
                        static_cast<dungeon_feature_type>(place.rune_subst);

Replacement in crawl-ref/source/dungeon.cc at line 5229 [4.3429798]
∅:D[45.3411] → [4.3609655:3609684]
B:BD[4.3609655] → [4.3609655:3609684]
```
                num_runes++;
```
[45.3411]
[4.3609684]
```
                place.num_runes++;
```
Replacement in crawl-ref/source/dungeon.cc at line 5250 [4.3429798]
B:BD[4.3610116] → [35.16870:16910]
```
            which_depth = level_number;
```
[4.3610116]
[35.16910]
```
            which_depth = place.level_number;
```

Replacement in crawl-ref/source/dungeon.cc at line 5254 [4.3429798]

B:BD[35.17069] → [35.17069:17123]

                which_depth = 5 + (level_number * 2);

[35.17069]

[12.14868]

                which_depth = 5 + (place.level_number * 2);

Replacement in crawl-ref/source/dungeon.cc at line 5269 [4.3429798]

B:BD[46.151429] → [31.85061:85136]

        _dgn_place_item_explicit(vgrid - 'd', where, place, level_number);

[46.151429]

[46.151517]

        _dgn_place_item_explicit(vgrid - 'd', where, place, place.level_number);

Replacement in crawl-ref/source/dungeon.cc at line 5287 [4.3429798]
B:BD[4.3610900] → [35.17368:17406]
```
        monster_level = level_number;
```
[4.3610900]
[35.17406]
```
        monster_level = place.level_number;
```

Replacement in crawl-ref/source/dungeon.cc at line 5289 [4.3429798]

B:BD[35.17432] → [35.17432:17484]

            monster_level = 4 + (level_number * 2);

[35.17432]

[35.17484]

            monster_level = 4 + (place.level_number * 2);

Replacement in crawl-ref/source/dungeon.cc at line 5291 [4.3429798]
B:BD[35.17515] → [35.17515:17561]
```
            monster_level = 5 + level_number;
```
[35.17515]
[4.3611047]
```
            monster_level = 5 + place.level_number;
```
Deletion in crawl-ref/source/dungeon.cc at line 5301 [4.3429798]
B:BD[4.3611532] → [4.3611532:3611533]
B:BD[4.3611533] → [20.10235:10301]
∅:D[20.10301] → [4.3611599:3611650]
B:BD[4.3611599] → [4.3611599:3611650]
```
    // Again, this seems odd, given that this is just one of many
    // vault types {dlb}
    return (altar_count);
```

Insertion in crawl-ref/source/dat/clua/ziggurat.lua at line 275 [36.11554]

[2.2766]

[38.13625]

  end
  local function place_loot(what)
    free_space_do(function (p)
                    dgn.create_item(p.x, p.y, what, loot_depth)
                  end)

Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 286 [36.11554]
B:BD[38.13715] → [38.13715:13750]
B:BD[38.13750] → [2.2767:2834]
∅:D[2.2834] → [38.13809:13836]
B:BD[38.13809] → [38.13809:13836]
```
        free_space_do(function (p)
                        dgn.create_item(p.x, p.y, "*", loot_depth)
                      end)
```
[38.13715]
[38.13836]
```
        place_loot("*")
```
Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 289 [36.11554]
B:BD[38.13855] → [38.13855:13888]
B:BD[38.13888] → [2.2835:2900]
∅:D[2.2900] → [38.13945:13970]
B:BD[38.13945] → [38.13945:13970]
```
      free_space_do(function (p)
                      dgn.create_item(p.x, p.y, "|", loot_depth)
                    end)
```
[38.13855]
[38.13970]
```
      place_loot("|")
```
Replacement in crawl-ref/source/dat/clua/ziggurat.lua at line 343 [36.11554]
B:BD[36.14450] → [36.14450:14520]
```
  return ziggurat_builders[crawl.random_range(1, #ziggurat_builders)]
```
[36.14450]
[36.14520]
```
  return util.random_from(ziggurat_builders)
```

Clean up legacy cruft involved in placing vaults.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/maps.h at line 28 [4.2007036]

Replacement in crawl-ref/source/maps.h at line 36 [4.2007036]

Replacement in crawl-ref/source/maps.cc at line 164 [4.2007666]

Deletion in crawl-ref/source/maps.cc at line 167 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 168 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 170 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 175 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 178 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 181 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 183 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 191 [4.2007666]

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

Replacement in crawl-ref/source/maps.cc at line 221 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 227 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 229 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 232 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 234 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 240 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 243 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 246 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 249 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 257 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 264 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 268 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 276 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 279 [4.2007666]

Replacement in crawl-ref/source/maps.cc at line 286 [4.2007666]

Insertion in crawl-ref/source/mapdef.h at line 260 [7.591249]

Replacement in crawl-ref/source/mapdef.cc at line 365 [7.594797]

Replacement in crawl-ref/source/mapdef.cc at line 406 [7.594797]

Replacement in crawl-ref/source/mapdef.cc at line 463 [7.594797]

Replacement in crawl-ref/source/mapdef.cc at line 491 [7.594797]

Replacement in crawl-ref/source/mapdef.cc at line 517 [7.594797]

Replacement in crawl-ref/source/mapdef.cc at line 630 [7.594797]

Replacement in crawl-ref/source/mapdef.cc at line 636 [7.594797]

Replacement in crawl-ref/source/mapdef.cc at line 671 [7.594797]

Replacement in crawl-ref/source/mapdef.cc at line 699 [7.594797]

Insertion in crawl-ref/source/mapdef.cc at line 757 [7.594797]

Replacement in crawl-ref/source/mapdef.cc at line 869 [7.594797]

Replacement in crawl-ref/source/mapdef.cc at line 928 [7.594797]

Replacement in crawl-ref/source/mapdef.cc at line 945 [7.594797]