fiddlerwoaroof/crawl - Change CREW3VTGN2BV622ZXHCPHUEZWBAGEQMNUELDLTHLEKG4VBXGMRPQC

Allow non-rectangular minivaults and branch entry vaults (use space padding).

They're still rectangular for collision detection with other vaults; that'll need more effort to fix.

Space padding can also be used for regular vaults, but it'll be ignored at the moment (but soon…! :-)).

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

Created by dshaligram on July 6, 2007

CREW3VTGN2BV622ZXHCPHUEZWBAGEQMNUELDLTHLEKG4VBXGMRPQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/util/levcomp.lpp at line 84 [3.81193]
B:BD[3.81770] → [3.81770:81810]
```
<MAPDEF>^\s*ENDMAP  { BEGIN(INITIAL); }
```
[3.81770]
[3.81833]
```
<MAPDEF>^\s*ENDMAP[ ]*  { BEGIN(INITIAL); }
```
Replacement in crawl-ref/source/util/levcomp.lpp at line 86 [3.81193]
B:BD[3.81834] → [4.9:32]
∅:D[4.32] → [3.81882:81917]
∅:D[5.58] → [3.81882:81917]
∅:D[6.373] → [3.81882:81917]
B:BD[3.81882] → [3.81882:81917]
```
<MAPDEF>^[^ \r\n\t]+ {
                        settext();
```
[3.81834]
[3.81917]
```
<MAPDEF>^[^\r\n\t]+ {
                        settext(true);
```
Insertion in crawl-ref/source/maps.cc at line 123 [9.2007666]
[7.668]
[8.4622]
```
    map.fixup();
```

Replacement in crawl-ref/source/maps.cc at line 150 [9.2007666]

B:BD[9.2153441] → [10.1359:1428]

static bool is_grid_clobbered(int sx, int sy, int width, int height)

[9.2153441]

[10.1428]

static bool is_grid_clobbered(const map_def &map,
                              int sx, int sy, int width, int height)

Insertion in crawl-ref/source/maps.cc at line 153 [9.2007666]
[10.1430]
[10.1430]
```
    const std::vector<std::string> &lines = map.map.get_lines();
```

Insertion in crawl-ref/source/maps.cc at line 158 [9.2007666]

[10.1535]

[11.6899]

            if (lines[y - sy][x - sx] == ' ')
                continue;

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

B:BD[10.1991] → [10.1991:2116]

static bool bad_map_place(int x, int y, int width, int height,
                         std::vector<vault_placement> *avoid)

[10.1991]

[10.2116]

static bool bad_map_place(const map_def &map,
                          int x, int y, int width, int height,
                          std::vector<vault_placement> *avoid)

Replacement in crawl-ref/source/maps.cc at line 199 [9.2007666]

B:BD[10.2468] → [10.2468:2521]

    return (is_grid_clobbered(x, y, width, height));

[10.2468]

[10.2521]

    return (is_grid_clobbered(map, x, y, width, height));

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

B:BD[10.2709] → [10.2709:2770]

    if (bad_map_place(startx, starty, width, height, avoid))

[10.2709]

[10.2770]

    if (bad_map_place(def, startx, starty, width, height, avoid))

Replacement in crawl-ref/source/mapdef.h at line 207 [3.591249]
B:BD[3.592456] → [3.592456:592494]
```
    void normalise(char fillc = 'x');
```
[3.592456]
[3.592494]
```
    void normalise(char fillc = ' ');
```
Replacement in crawl-ref/source/mapdef.cc at line 1604 [3.594797]
B:BD[3.601704] → [3.601704:601750]
```
    map.normalise(is_minivault()? '.' : 'x');
```
[3.601704]
[3.601750]
```
    map.normalise(' ');
```

Insertion in crawl-ref/source/dungeon.h at line 269 [9.3428186]

[12.9192]


    if (grid == NUM_FEATURES)
    {
        if (want_exit)
        {
            greedy_dist = 100;
            greedy_place = coord_def(-1, -1);
            return (true);
        }
        return (false);
    }

Insertion in crawl-ref/source/dungeon.cc at line 2541 [9.3429798]
[2.1547]
[13.728]
```
    const std::vector<std::string> &lines = place.map.map.get_lines();
```

Insertion in crawl-ref/source/dungeon.cc at line 2546 [9.3429798]

[13.855]

            if (lines[vy - v1y][vx - v1x] == ' ')
                continue;

Insertion in crawl-ref/source/dungeon.cc at line 2571 [9.3429798]
[2.1807]
[13.1412]
```
    const std::vector<std::string> &lines = place.map.map.get_lines();
```
Deletion in crawl-ref/source/dungeon.cc at line 2574 [9.3429798]
B:BD[13.1471] → [13.1471:1526]
```
        //  if (vx != v1x && vx != v1x + 12) continue;
```

Insertion in crawl-ref/source/dungeon.cc at line 2576 [9.3429798]

[13.1594]

            if (lines[vy - v1y][vx - v1x] == ' ')
                continue;

Deletion in crawl-ref/source/dungeon.cc at line 2649 [9.3429798]
∅:D[13.2761] → [3.968247:968296]
B:BD[9.3596611] → [3.968247:968296]
∅:D[3.968296] → [9.3596651:3596657]
B:BD[9.3596651] → [9.3596651:3596657]
B:BD[9.3596657] → [3.968297:968351]
∅:D[3.968351] → [9.3596701:3596711]
B:BD[9.3596701] → [9.3596701:3596711]
B:BD[9.3596711] → [3.968352:968463]
B:BD[3.968463] → [11.10965:11091]
∅:D[11.11091] → [9.3596764:3596781]
∅:D[3.968516] → [9.3596764:3596781]
B:BD[9.3596764] → [9.3596764:3596781]
```
    for (vx = v1x; vx < v1x + place.width; vx++)
    {
        for (vy = v1y; vy < v1y + place.height; vy++)
        {
            // [dshaligram] vault_main always populates vgrid[y][x] instead of
            // vgrid[x][y] now.
            grd[vx][vy] =
                static_cast<dungeon_feature_type>(
                    vgrid[vy - v1y][vx - v1x] );
        }
    }
```

Insertion in crawl-ref/source/dungeon.cc at line 2658 [9.3429798]

[9.3597009]

[14.148773]

            const int feat = vgrid[vy - v1y][vx - v1x];
            if (feat == ' ')
                continue;

Replacement in crawl-ref/source/dungeon.cc at line 2664 [9.3429798]

∅:D[15.5557] → [16.149776:149835]

B:BD[9.3597150] → [16.149776:149835]

                                      grd[vx][vy], dummy,

[15.5557]

[14.148893]

                                      feat, dummy,

Replacement in crawl-ref/source/dungeon.cc at line 3029 [9.3429798]
B:BD[9.3599112] → [9.3599112:3599145]
```
    for (vx = 0; vx < GXM; vx++)
```
[9.3599112]
[9.3599145]
```
    for (vx = place.x; vx < place.x + place.width; vx++)
```
Replacement in crawl-ref/source/dungeon.cc at line 3031 [9.3429798]
B:BD[9.3599151] → [9.3599151:3599188]
```
        for (vy = 0; vy < GYM; vy++)
```
[9.3599151]
[9.3599188]
```
        for (vy = place.y; vy < place.y + place.height; vy++)
```
Replacement in crawl-ref/source/dungeon.cc at line 3033 [9.3429798]
B:BD[9.3599198] → [10.8589:8648]
```
            if (!this_vault.contains( coord_def(vx, vy) ))
```
[9.3599198]
[10.8648]
```
            if (vgrid[vy][vx] == ' ')
```
Deletion in crawl-ref/source/dungeon.cc at line 3035 [9.3429798]
B:BD[10.8674] → [10.8674:8687]
```
            
```
Insertion in crawl-ref/source/dungeon.cc at line 3309 [9.3429798]
[12.9992]
[12.9992]
```
    if (rawfeat == ' ')
        return (NUM_FEATURES);
```

Replacement in crawl-ref/source/dat/orc.des at line 31 [17.63762]

B:BD[17.64782] → [17.64782:64964]

xxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxOxxxxxxxxxxxx
xxxxxxxxx.......xxxxxxxxx
xxxxxx.............xxxxxx
xxxx....x.......x....xxxx
xxx....xxx.....xxx....xxx
xx.....xxx.I.I.xxx..I..xx

[17.64782]

[17.64964]

           xxx
        xxxxOxxxx
     xxxx.......xxxx
   xxx.............xxx
  xx....x.......x....xx
 xx....xxx.....xxx....xx
xx.....xxx.I.I.xxx..I..x

Replacement in crawl-ref/source/dat/orc.des at line 47 [17.63762]
B:BD[17.65198] → [17.65198:65250]
```
xxx...xxxxx...xxxxx...xxx
xxx.@.xxxxxxxxxxxxx.@.xxx
```
[17.65198]
[17.65250]
```
 xx...xx xx...xx xx...xx
  x.@.x   xxxxx   x.@.x
```
Replacement in crawl-ref/source/dat/mini.des at line 1228 [17.75280]
B:BD[2.2458] → [2.2458:2464]
```
.x+x.
```
[2.2458]
[2.2464]
```
 x+x 
```
Replacement in crawl-ref/source/dat/mini.des at line 1232 [17.75280]
B:BD[2.2482] → [2.2482:2488]
```
.xxx.
```
[2.2482]
[17.96123]
```
 xxx 
```
Replacement in crawl-ref/source/dat/mini.des at line 1245 [17.75280]
B:BD[2.2702] → [2.2702:2708]
```
.x+x.
```
[2.2702]
[2.2708]
```
 x+x 
```
Replacement in crawl-ref/source/dat/mini.des at line 1249 [17.75280]
B:BD[2.2726] → [2.2726:2732]
```
.xxx.
```
[2.2726]
[2.2732]
```
 xxx 
```
Replacement in crawl-ref/source/dat/entry.des at line 203 [18.591]
B:BD[18.4655] → [18.4655:4664]
```
ENDMAP  
```
[18.4655]
[18.4664]
```
ENDMAP
```

Allow non-rectangular minivaults and branch entry vaults (use space padding).

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/util/levcomp.lpp at line 84 [3.81193]

Replacement in crawl-ref/source/util/levcomp.lpp at line 86 [3.81193]

Insertion in crawl-ref/source/maps.cc at line 123 [9.2007666]

Replacement in crawl-ref/source/maps.cc at line 150 [9.2007666]

Insertion in crawl-ref/source/maps.cc at line 153 [9.2007666]

Insertion in crawl-ref/source/maps.cc at line 158 [9.2007666]

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

Replacement in crawl-ref/source/maps.cc at line 199 [9.2007666]

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

Replacement in crawl-ref/source/mapdef.h at line 207 [3.591249]

Replacement in crawl-ref/source/mapdef.cc at line 1604 [3.594797]

Insertion in crawl-ref/source/dungeon.h at line 269 [9.3428186]

Insertion in crawl-ref/source/dungeon.cc at line 2541 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 2546 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 2571 [9.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 2574 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 2576 [9.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 2649 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 2658 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2664 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3029 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3031 [9.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3033 [9.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 3035 [9.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 3309 [9.3429798]

Replacement in crawl-ref/source/dat/orc.des at line 31 [17.63762]

Replacement in crawl-ref/source/dat/orc.des at line 47 [17.63762]

Replacement in crawl-ref/source/dat/mini.des at line 1228 [17.75280]

Replacement in crawl-ref/source/dat/mini.des at line 1232 [17.75280]

Replacement in crawl-ref/source/dat/mini.des at line 1245 [17.75280]

Replacement in crawl-ref/source/dat/mini.des at line 1249 [17.75280]

Replacement in crawl-ref/source/dat/entry.des at line 203 [18.591]