fiddlerwoaroof/crawl - Change KIDHPMZSLUVK3TF4565MH7SJ57C45SORJXR274VJTOULNOTGHQ4AC

Removed redundant buffer used to go from map_def to env.grid and all the tedious code used to mess with this pointless buffer.

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

Created by dshaligram on November 23, 2008

KIDHPMZSLUVK3TF4565MH7SJ57C45SORJXR274VJTOULNOTGHQ4AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/util/levcomp.lpp at line 14 [4.81193]
[4.81362]
[4.81381]
```
#include "stuff.h"
```
Insertion in crawl-ref/source/traps.cc at line 39 [5.5308]
[5.6001]
[5.6001]
```
#include "stuff.h"
```
Insertion in crawl-ref/source/newgame.cc at line 37 [6.1132300]
[5.58811]
[6.1135395]
```
#include "dungeon.h"
```
Deletion in crawl-ref/source/maps.h at line 15 [6.2007036]
B:BD[4.582770] → [7.362:382]
```
#include "mapdef.h"
```
Deletion in crawl-ref/source/maps.h at line 19 [6.2007036]
B:BD[4.582786] → [4.582786:582811]
B:BD[4.582811] → [8.226:265]
```
struct vault_placement
{
    coord_def pos;
    coord_def size;
```
Replacement in crawl-ref/source/maps.h at line 20 [6.2007036]
∅:D[8.266] → [9.139090:139106]
B:BD[4.582848] → [9.139090:139106]
B:BD[9.139106] → [7.383:400]
B:BD[7.400] → [10.298:332]
B:BD[10.332] → [11.2514:2649]
∅:D[10.332] → [6.2007312:2007313]
∅:D[7.400] → [6.2007312:2007313]
∅:D[11.2649] → [6.2007312:2007313]
∅:D[4.582872] → [6.2007312:2007313]
B:BD[6.2007312] → [6.2007312:2007313]
B:BD[6.2007313] → [4.582873:582895]
B:BD[4.582895] → [8.267:320]
B:BD[8.320] → [11.2650:2741]
∅:D[10.403] → [4.582950:582965]
∅:D[7.452] → [4.582950:582965]
∅:D[11.2741] → [4.582950:582965]
B:BD[4.582950] → [4.582950:582965]
∅:D[4.582965] → [6.2007624:2007625]
B:BD[6.2007624] → [6.2007624:2007625]
B:BD[6.2007625] → [2.2594:2625]
∅:D[2.2625] → [10.404:440]
B:BD[4.582998] → [10.404:440]
```
    int orient;
    map_def map;
    std::vector<coord_def> exits;
    int level_number, altar_count, num_runes;
    // If we're not placing runes, this is the substitute feature.
    int rune_subst;
    vault_placement()
        : pos(-1, -1), size(0, 0), orient(0), map(),
          exits(), level_number(0), altar_count(0), num_runes(0),
          rune_subst(-1)
    {
    }
};
int vault_main(map_type vgrid,
               vault_placement &vp,
```
[8.266]
[10.440]
```
int vault_main(vault_placement &vp,
```
Replacement in crawl-ref/source/maps.cc at line 33 [6.2007666]
B:BD[6.2008141] → [12.12282:12333]
```
static int write_vault(map_def &mdef, map_type mt,
```
[6.2008141]
[10.560]
```
static int write_vault(map_def &mdef,
```
Deletion in crawl-ref/source/maps.cc at line 38 [6.2007666]
∅:D[9.139216] → [4.583879:583917]
B:BD[4.583879] → [4.583879:583917]
```
                        map_type map,
```

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

B:BD[6.2015297] → [13.2741:2813]

int vault_main( map_type vgrid,
                vault_placement &place,

[6.2015297]

[13.2813]

int vault_main( vault_placement &place,

Deletion in crawl-ref/source/maps.cc at line 72 [6.2007666]
B:BD[6.2015403] → [13.2913:2981]
∅:D[13.2981] → [4.584580:584622]
B:BD[4.584580] → [4.584580:584622]
∅:D[4.584622] → [6.2015615:2015621]
B:BD[6.2015615] → [6.2015615:2015621]
B:BD[6.2015621] → [4.584623:584669]
∅:D[4.584669] → [6.2015657:2015689]
B:BD[6.2015657] → [6.2015657:2015689]
B:BD[6.2015689] → [4.584670:584736]
∅:D[4.584736] → [6.2015749:2015756]
B:BD[6.2015749] → [6.2015749:2015756]
```
    // First, fill in entirely with walls and null-terminate {dlb}:
    for (int vx = 0; vx < MAP_SIDE; vx++)
    {
        for (int vy = 0; vy < MAP_SIDE; vy++)
          vgrid[vx][vy] = 'x';
        vgrid[MAP_SIDE][vx] = 0;
        vgrid[vx][MAP_SIDE] = 0;
    }
```

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

B:BD[14.4618] → [3.2680:2755]

    return (write_vault( vdefs[which_vault], vgrid, place, check_place ));

[14.4618]

[14.4619]

    return (write_vault( vdefs[which_vault], place, check_place ));

Replacement in crawl-ref/source/maps.cc at line 78 [6.2007666]
B:BD[6.2139584] → [12.12436:12488]
```
static int write_vault(map_def &mdef, map_type map,
```
[6.2139584]
[10.899]
```
static int write_vault(map_def &mdef,
```

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

B:BD[15.2303] → [15.2303:2365]

        place.orient = apply_vault_definition(place.map, map,

[15.2303]

[3.2798]

        place.orient = apply_vault_definition(place.map,

Replacement in crawl-ref/source/maps.cc at line 201 [6.2007666]
B:BD[8.1026] → [12.12499:12556]
```
static bool apply_vault_grid(map_def &def, map_type map,
```
[8.1026]
[10.2582]
```
static bool apply_vault_grid(map_def &def,
```

Deletion in crawl-ref/source/maps.cc at line 259 [6.2007666]

B:BD[6.2169533] → [4.587074:587233]

B:BD[4.587233] → [11.4266:4331]

∅:D[8.1626] → [4.587295:587302]

∅:D[11.4331] → [4.587295:587302]

B:BD[4.587295] → [4.587295:587302]

    const std::vector<std::string> &lines = ml.get_lines();
#ifdef DEBUG_DIAGNOSTICS
    mprf(MSGCH_DIAGNOSTICS, "Applying %s at (%d,%d), dimensions (%d,%d)",
            def.name.c_str(), start.x, start.y, size.x, size.y);
#endif

Deletion in crawl-ref/source/maps.cc at line 260 [6.2007666]
B:BD[6.2169534] → [11.4332:4385]
∅:D[8.1680] → [4.587354:587360]
∅:D[11.4385] → [4.587354:587360]
B:BD[4.587354] → [4.587354:587360]
B:BD[4.587360] → [8.1681:1790]
∅:D[8.1790] → [4.587467:587473]
∅:D[16.4968] → [4.587467:587473]
B:BD[4.587467] → [4.587467:587473]
∅:D[4.587473] → [6.2169608:2169609]
B:BD[6.2169608] → [6.2169608:2169609]
```
    for (int y = start.y; y < start.y + size.y; ++y)
    {
        const std::string &s = lines[y - start.y];
        strncpy(&map[y][start.x], s.c_str(), s.length());
    }
```
Deletion in crawl-ref/source/maps.cc at line 268 [6.2007666]
∅:D[9.139628] → [4.587634:587656]
B:BD[4.587634] → [4.587634:587656]
```
        map_type map,
```

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

B:BD[6.2177452] → [3.2998:3055]

    if (!apply_vault_grid(def, map, place, check_place))

[6.2177452]

[10.3100]

    if (!apply_vault_grid(def, place, check_place))

Insertion in crawl-ref/source/mapdef.h at line 263 [4.591249]
[9.139837]
[9.139837]
```
    int glyph(const coord_def &) const;
```

Insertion in crawl-ref/source/mapdef.cc at line 767 [4.594797]

[9.140833]

int map_lines::glyph(const coord_def &c) const
{
    return glyph(c.x, c.y);
}

Deletion in crawl-ref/source/makeitem.h at line 12 [17.516]
B:BD[17.556] → [17.556:577]
```
#include "dungeon.h"
```
Insertion in crawl-ref/source/makeitem.cc at line 19 [17.927]
[5.73593]
[5.73593]
```
#include "dungeon.h"
```
Insertion in crawl-ref/source/makeitem.cc at line 31 [17.927]
[17.1178]
[18.1002]
```
#include "travel.h"
```
Insertion in crawl-ref/source/dungeon.h at line 19 [6.3428186]
[19.6363]
[20.2543]
```
#include "mapdef.h"
```

Deletion in crawl-ref/source/dungeon.h at line 51 [6.3428186]

B:BD[6.3428537] → [4.947900:948130]

// This may sometimes be used as map_type[x][y] (for minivaults) and as
// map_type[y][x] for large-scale vaults. Keep an eye out for the associated
// brain-damage. [dshaligram]
typedef char map_type[MAP_SIDE + 1][MAP_SIDE + 1];

Insertion in crawl-ref/source/dungeon.h at line 54 [6.3428186]
[21.2734]
[22.3103]
```
extern bool Generating_Level;
```
Insertion in crawl-ref/source/dungeon.h at line 142 [6.3428186]
[9.148283]
[14.17616]
```
struct vault_placement
{
public:
    coord_def pos;
    coord_def size;
```

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

[14.17617]

    int orient;
    map_def map;
    std::vector<coord_def> exits;
    int level_number, altar_count, num_runes;
    // If we're not placing runes, this is the substitute feature.
    int rune_subst;
public:
    vault_placement()
        : pos(-1, -1), size(0, 0), orient(0), map(),
          exits(), level_number(0), altar_count(0), num_runes(0),
          rune_subst(-1)
    {
    }
    void reset();
    void apply_grid();
    void draw_at(const coord_def &c);
};

Deletion in crawl-ref/source/dungeon.cc at line 214 [6.3429798]
B:BD[11.6043] → [11.6043:6101]
```
                         std::vector<coord_def> &targets,
```
Deletion in crawl-ref/source/dungeon.cc at line 3943 [6.3429798]
∅:D[23.5364] → [4.967493:967513]
∅:D[12.14394] → [4.967493:967513]
B:BD[6.3595024] → [4.967493:967513]
```
    map_type vgrid;
```
Replacement in crawl-ref/source/dungeon.cc at line 3946 [6.3429798]
∅:D[11.6192] → [24.160:203]
B:BD[4.967540] → [24.160:203]
```
    vault_main(vgrid, place, force_vault);
```
[11.6192]
[25.4617]
```
    vault_main(place, force_vault);
```
Replacement in crawl-ref/source/dungeon.cc at line 3971 [6.3429798]
B:BD[12.14396] → [11.6193:6221]
∅:D[11.6221] → [26.454:516]
B:BD[6.3596868] → [26.454:516]
B:BD[26.516] → [12.14397:14398]
∅:D[16.9471] → [13.9086:9128]
B:BD[12.14398] → [13.9086:9128]
B:BD[13.9128] → [27.2780:2847]
∅:D[27.2847] → [28.81110:81356]
B:BD[28.81110] → [28.81110:81356]
B:BD[28.81356] → [11.6222:6283]
B:BD[11.6283] → [3.3678:3709]
∅:D[29.1839] → [6.3596999:3597009]
∅:D[3.3709] → [6.3596999:3597009]
∅:D[8.3975] → [6.3596999:3597009]
∅:D[28.81689] → [6.3596999:3597009]
∅:D[4.968621] → [6.3596999:3597009]
B:BD[6.3596999] → [6.3596999:3597009]
B:BD[6.3597009] → [28.81690:81927]
∅:D[20.5317] → [6.3597288:3597298]
∅:D[28.81927] → [6.3597288:3597298]
∅:D[30.148944] → [6.3597288:3597298]
B:BD[6.3597288] → [6.3597288:3597298]
B:BD[6.3597298] → [16.9472:9518]
∅:D[16.9545] → [28.81928:81934]
B:BD[6.3597298] → [28.81928:81934]
B:BD[16.9612] → [16.9612:9613]
∅:D[16.9613] → [28.81935:81973]
B:BD[31.2763] → [28.81935:81973]
```
    // This is a throwaway.
    std::vector<coord_def> &target_connections = place.exits;
    // Paint the minivault onto the grid.
    for (rectangle_iterator ri(v1, v1 + place.size - 1); ri; ++ri)
    {
        const coord_def vdelta = *ri - v1;
        // FIXME: why the y and x swap?
        const int feat = vgrid[vdelta.y][vdelta.x];
        if (feat == ' ')
            continue;
        const dungeon_feature_type oldgrid = grd(*ri);
        _vault_grid( place, feat, *ri, target_connections );
        if (!Generating_Level)
        {
            link_items();
            const dungeon_feature_type newgrid = grd(*ri);
            grd(*ri) = oldgrid;
            dungeon_terrain_changed(*ri, newgrid, true, true);
            env.markers.remove_markers_at(*ri, MAT_ANY);
        }
        env.map(*ri).property |= FPROP_VAULT;
    }
    place.map.map.apply_overlays(v1);
```
[12.14396]
[20.5376]
```
    place.apply_grid();
```

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

[32.917]

        // This is a throwaway.
        std::vector<coord_def> &target_connections = place.exits;

Deletion in crawl-ref/source/dungeon.cc at line 4478 [6.3429798]
∅:D[23.5468] → [4.968622:968642]
∅:D[12.14453] → [4.968622:968642]
B:BD[6.3598711] → [4.968622:968642]
```
    map_type vgrid;
```
Deletion in crawl-ref/source/dungeon.cc at line 4481 [6.3429798]
∅:D[11.6324] → [10.8322:8384]
B:BD[4.968669] → [10.8322:8384]
∅:D[10.8384] → [6.3598735:3598736]
∅:D[4.968669] → [6.3598735:3598736]
B:BD[6.3598735] → [6.3598735:3598736]
```
    std::vector<coord_def> &target_connections = place.exits;
```
Replacement in crawl-ref/source/dungeon.cc at line 4484 [6.3429798]
∅:D[8.6229] → [20.8346:8407]
∅:D[12.14455] → [20.8346:8407]
B:BD[6.3598736] → [20.8346:8407]
```
    const int gluggy = vault_main(vgrid, place, force_vault,
```
[12.14455]
[3.4462]
```
    const int gluggy = vault_main(place, force_vault,
```

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

∅:D[16.9715] → [8.6230:6280]

B:BD[6.3599021] → [8.6230:6280]

B:BD[8.6280] → [33.7860:7888]

∅:D[27.2941] → [28.82053:82059]

∅:D[33.7888] → [28.82053:82059]

B:BD[28.82053] → [28.82053:82059]

B:BD[28.82059] → [33.7889:8170]

∅:D[33.8170] → [20.8470:8471]

∅:D[28.82121] → [20.8470:8471]

B:BD[10.8674] → [20.8470:8471]

B:BD[20.8471] → [33.8171:8230]

B:BD[33.8230] → [11.6325:6430]

B:BD[11.6430] → [3.4516:4551]

∅:D[3.4551] → [33.8620:9077]

B:BD[33.8620] → [33.8620:9077]

∅:D[10.8789] → [6.3599478:3599488]

∅:D[20.8990] → [6.3599478:3599488]

∅:D[33.9077] → [6.3599478:3599488]

∅:D[28.82900] → [6.3599478:3599488]

∅:D[30.149116] → [6.3599478:3599488]

B:BD[6.3599478] → [6.3599478:3599488]

∅:D[16.9789] → [28.82901:82907]

B:BD[6.3599488] → [28.82901:82907]

B:BD[16.9856] → [16.9856:9857]

∅:D[16.9857] → [8.6419:6464]

B:BD[6.3599495] → [8.6419:6464]

    dgn_region this_vault(place.pos, place.size);
    if (!place.size.zero())
    {
        // NOTE: assumes *no* previous item (I think) or monster (definitely)
        // placement.
        for ( rectangle_iterator ri(place.pos, place.pos + place.size - 1);
              ri; ++ri )
        {
            if (vgrid[ri->y][ri->x] == ' ')
                continue;
            const dungeon_feature_type oldgrid = grd(*ri);
            _vault_grid( place, vgrid[ri->y][ri->x], *ri,
                         target_connections );
            if (!Generating_Level)
            {
                // Have to link items each square at a time, or
                // dungeon_terrain_changed could blow up.
                link_items();
                const dungeon_feature_type newgrid = grd(*ri);
                grd(*ri) = oldgrid;
                dungeon_terrain_changed(*ri, newgrid, true, true);
                env.markers.remove_markers_at(*ri, MAT_ANY);
            }
            env.map(*ri).property |= FPROP_VAULT;
        }
    }
    place.map.map.apply_overlays(place.pos);

[6.3598813]

[34.33109]

    place.apply_grid();

Insertion in crawl-ref/source/dungeon.cc at line 4493 [6.3429798]
[35.1738]
[36.2684]
```
    std::vector<coord_def> &target_connections = place.exits;
```
Deletion in crawl-ref/source/dungeon.cc at line 5000 [6.3429798]
B:BD[11.6799] → [11.6799:6857]
```
                         std::vector<coord_def> &targets,
```

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

B:BD[37.11892] → [11.6946:7011]

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

[37.11892]

[37.12151]

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

Replacement in crawl-ref/source/dungeon.cc at line 5091 [6.3429798]
B:BD[6.3607726] → [28.84558:84594]
```
        targets.push_back( where );
```
[6.3607726]
[6.3607774]
```
        place.exits.push_back( where );
```
Replacement in crawl-ref/source/dungeon.cc at line 5106 [6.3429798]
B:BD[38.456] → [28.84897:84933]
```
        targets.push_back( where );
```
[38.456]
[38.504]
```
        place.exits.push_back( where );
```
Replacement in crawl-ref/source/dungeon.cc at line 6569 [6.3429798]
B:BD[31.3824] → [31.3824:3881]
```
    map_type vgrid;
    vault_main(vgrid, place, vault);
```
[31.3824]
[39.2636]
```
    vault_main(place, vault);
```

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

[40.19904]


//////////////////////////////////////////////////////////////////////////
// vault_placement
void vault_placement::reset()
{
    altar_count = 0;
}
void vault_placement::apply_grid()
{
    if (!size.zero())
    {
        // NOTE: assumes *no* previous item (I think) or monster (definitely)
        // placement.
        for ( rectangle_iterator ri(pos, pos + size - 1); ri; ++ri )
        {
            const coord_def &rp(*ri);
            const coord_def dp = rp - pos;
            const int feat = map.map.glyph(dp);
            if (feat == ' ')
                continue;
            const dungeon_feature_type oldgrid = grd(*ri);
            _vault_grid( *this, feat, *ri );
            if (!Generating_Level)
            {
                // Have to link items each square at a time, or
                // dungeon_terrain_changed could blow up.
                link_items();
                const dungeon_feature_type newgrid = grd(*ri);
                grd(*ri) = oldgrid;
                dungeon_terrain_changed(*ri, newgrid, true, true);
                env.markers.remove_markers_at(*ri, MAT_ANY);
            }
            env.map(*ri).property |= FPROP_VAULT;
        }
        map.map.apply_overlays(pos);
    }
}
void vault_placement::draw_at(const coord_def &c)
{
    pos = c;
    apply_grid();
}

Removed redundant buffer used to go from map_def to env.grid and all the tedious code used to mess with this pointless buffer.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/util/levcomp.lpp at line 14 [4.81193]

Insertion in crawl-ref/source/traps.cc at line 39 [5.5308]

Insertion in crawl-ref/source/newgame.cc at line 37 [6.1132300]

Deletion in crawl-ref/source/maps.h at line 15 [6.2007036]

Deletion in crawl-ref/source/maps.h at line 19 [6.2007036]

Replacement in crawl-ref/source/maps.h at line 20 [6.2007036]

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

Deletion in crawl-ref/source/maps.cc at line 38 [6.2007666]

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

Deletion in crawl-ref/source/maps.cc at line 72 [6.2007666]

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

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

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

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

Deletion in crawl-ref/source/maps.cc at line 259 [6.2007666]

Deletion in crawl-ref/source/maps.cc at line 260 [6.2007666]

Deletion in crawl-ref/source/maps.cc at line 268 [6.2007666]

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

Insertion in crawl-ref/source/mapdef.h at line 263 [4.591249]

Insertion in crawl-ref/source/mapdef.cc at line 767 [4.594797]

Deletion in crawl-ref/source/makeitem.h at line 12 [17.516]

Insertion in crawl-ref/source/makeitem.cc at line 19 [17.927]

Insertion in crawl-ref/source/makeitem.cc at line 31 [17.927]

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

Deletion in crawl-ref/source/dungeon.h at line 51 [6.3428186]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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