fiddlerwoaroof/crawl - Change SWE3F3BLKHYMJEJLXNFH3MR2E6VDEYXJ6DL7QLPP47BJEKEUCAMAC

First steps toward removing the need for 6-deep rock-wall padding around dungeon maps. This is likely to be buggy for a while.

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

Created by dshaligram on October 6, 2007

SWE3F3BLKHYMJEJLXNFH3MR2E6VDEYXJ6DL7QLPP47BJEKEUCAMAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.h at line 121 [4.13254]

B:BD[4.15697] → [5.247:315]

void show_map( FixedVector<int, 2>& spec_place, bool travel_mode );

[4.15697]

[4.16286]

void show_map( coord_def &spec_place, bool travel_mode );

Replacement in crawl-ref/source/view.cc at line 2724 [4.16817]
B:BD[6.753] → [7.4687:4718]
```
            if (!in_bounds(c))
```
[6.753]
[4.73294]
```
            if (!map_bounds(c))
```

Replacement in crawl-ref/source/view.cc at line 2796 [4.16817]

B:BD[8.829] → [8.829:896]

void show_map( FixedVector<int, 2> &spec_place, bool travel_mode )

[8.829]

[8.896]

void show_map( coord_def &spec_place, bool travel_mode )

Replacement in crawl-ref/source/view.cc at line 3101 [4.16817]

B:BD[9.553] → [9.553:633]

                spec_place[0] = grdp.x;
                spec_place[1] = grdp.y;

[9.553]

[9.633]

                spec_place = grdp;

Replacement in crawl-ref/source/view.cc at line 3135 [4.16817]

∅:D[10.2680] → [8.9011:9081]

B:BD[8.9011] → [8.9011:9081]

                spec_place[0] = x;
                spec_place[1] = y;

[10.2680]

[8.9081]

                spec_place = coord_def(x, y);

Deletion in crawl-ref/source/spells3.cc at line 563 [4.531613]
B:BD[4.549534] → [4.549534:549568]
```
    FixedVector < int, 2 > plox;
```
Replacement in crawl-ref/source/spells3.cc at line 564 [4.531613]
B:BD[4.549569] → [4.549569:549603]
```
    plox[0] = 1;
    plox[1] = 0;
```
[4.549569]
[4.549603]
```
    coord_def pos(1, 0);
```
Replacement in crawl-ref/source/spells3.cc at line 572 [4.531613]
B:BD[4.549771] → [5.147808:147839]
```
        show_map(plox, false);
```
[4.549771]
[4.549795]
```
        show_map(pos, false);
```

Replacement in crawl-ref/source/spells3.cc at line 577 [4.531613]

B:BD[4.549844] → [11.6078:6155]

        mprf(MSGCH_DIAGNOSTICS, "Target square (%d,%d)", plox[0], plox[1] );

[4.549844]

[4.549964]

        mprf(MSGCH_DIAGNOSTICS, "Target square (%d,%d)", pos.x, pos.y );

Replacement in crawl-ref/source/spells3.cc at line 580 [4.531613]

B:BD[4.549972] → [4.549972:550042]

        plox[0] += random2(3) - 1;
        plox[1] += random2(3) - 1;

[4.549972]

[4.550042]

        pos.x += random2(3) - 1;
        pos.y += random2(3) - 1;

Replacement in crawl-ref/source/spells3.cc at line 585 [4.531613]

B:BD[4.550083] → [4.550083:550161]

            plox[0] += random2(3) - 1;
            plox[1] += random2(3) - 1;

[4.550083]

[4.550161]

            pos.x += random2(3) - 1;
            pos.y += random2(3) - 1;

Replacement in crawl-ref/source/spells3.cc at line 589 [4.531613]

B:BD[4.550172] → [4.550172:550274]

        if (plox[0] < 6 || plox[1] < 6 || plox[0] > (GXM - 5)
                || plox[1] > (GYM - 5))

[4.550172]

[4.550274]

        if (!in_bounds(pos))

Replacement in crawl-ref/source/spells3.cc at line 597 [4.531613]

B:BD[11.6188] → [11.6188:6256]

             "Scattered target square (%d,%d)", plox[0], plox[1] );

[11.6188]

[4.550555]

             "Scattered target square (%d,%d)", pos.x, pos.y );

Replacement in crawl-ref/source/spells3.cc at line 602 [4.531613]
B:BD[4.550600] → [12.7116:7158]
```
            you.moveto(plox[0], plox[1]);
```
[4.550600]
[4.550666]
```
            you.moveto(pos.x, pos.y);
```

Replacement in crawl-ref/source/spells3.cc at line 625 [4.531613]

B:BD[4.551326] → [2.175:263]

            newx = 5 + random2( GXM - 10 );
            newy = 5 + random2( GYM - 10 );

[4.551326]

[4.551424]

            newx = random_range(X_BOUND_1 + 1, X_BOUND_2 - 1);
            newy = random_range(Y_BOUND_1 + 1, Y_BOUND_2 - 1);

Deletion in crawl-ref/source/spells3.cc at line 801 [4.531613]
B:BD[4.556066] → [4.556066:556099]
```
    FixedVector < int, 2 > plox;
```
Replacement in crawl-ref/source/spells3.cc at line 802 [4.531613]
B:BD[4.556100] → [4.556100:556134]
```
    plox[0] = 1;
    plox[1] = 0;
```
[4.556100]
[4.556134]
```
    coord_def pos(1, 0);
```
Replacement in crawl-ref/source/spells3.cc at line 806 [4.531613]
B:BD[4.556220] → [5.147840:147867]
```
    show_map(plox, false);
```
[4.556220]
[4.556240]
```
    show_map(pos, false);
```

Replacement in crawl-ref/source/spells3.cc at line 811 [4.531613]

B:BD[4.556285] → [11.6257:6330]

    mprf(MSGCH_DIAGNOSTICS, "Target square (%d,%d)", plox[0], plox[1] );

[4.556285]

[4.556397]

    mprf(MSGCH_DIAGNOSTICS, "Target square (%d,%d)", pos.x, pos.y );

Replacement in crawl-ref/source/spells3.cc at line 814 [4.531613]
B:BD[4.556405] → [4.556405:556444]
```
    if (!silenced( plox[0], plox[1] ))
```
[4.556405]
[4.556444]
```
    if (!silenced( pos.x, pos.y ))
```

Replacement in crawl-ref/source/spells3.cc at line 816 [4.531613]

B:BD[4.556450] → [4.556450:556619]

B:BD[4.556619] → [5.147868:147926]

        // player can use this spell to "sound out" the dungeon -- bwr
        if (plox[0] > 1 && plox[0] < (GXM - 2) 
            && plox[1] > 1 && plox[1] < (GYM - 2)
            && !grid_is_solid(grd[ plox[0] ][ plox[1] ]))

[4.556450]

[4.556684]

        if (in_bounds(pos) && !grid_is_solid(grd(pos)))

Replacement in crawl-ref/source/spells3.cc at line 818 [4.531613]
B:BD[4.556694] → [4.556694:556737]
```
            noisy( 30, plox[0], plox[1] );
```
[4.556694]
[4.556737]
```
            noisy( 30, pos.x, pos.y );
```

Replacement in crawl-ref/source/spells3.cc at line 826 [4.531613]

B:BD[11.6428] → [11.6428:6501]

                     (see_grid( plox[0], plox[1] ) ? "distant " : "") );

[11.6428]

[4.556905]

                     (!see_grid( pos.x, pos.y ) ? "distant " : "") );

Replacement in crawl-ref/source/dungeon.cc at line 1361 [4.3429798]
B:BD[4.3551378] → [4.3551378:3551416]
```
    for (i = 10; i < (GXM - 10); i++)
```
[4.3551378]
[4.3551416]
```
    for (i = 1; i < (GXM - 1); i++)
```
Replacement in crawl-ref/source/dungeon.cc at line 1363 [4.3429798]
B:BD[4.3551422] → [4.3551422:3551464]
```
        for (j = 10; j < (GYM - 10); j++)
```
[4.3551422]
[4.3551464]
```
        for (j = 1; j < (GYM - 1); j++)
```

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

B:BD[4.3567666] → [4.3567666:3567726]

        sx = random2(GXM-10);
        sy = random2(GYM-10);

[4.3567666]

[4.3567726]

        sx = random_range(X_BOUND_1 + 1, X_BOUND_2 - 1);
        sy = random_range(Y_BOUND_1 + 1, Y_BOUND_2 - 1);

Replacement in crawl-ref/source/dungeon.cc at line 2227 [4.3429798]
B:BD[4.3572148] → [4.3572148:3572170]
```
        if (x_ps < 8)
```
[4.3572148]
[4.3572170]
```
        if (x_ps < X_BOUND_1 + 3)
```
Replacement in crawl-ref/source/dungeon.cc at line 2233 [4.3429798]
B:BD[4.3572237] → [4.3572237:3572259]
```
        if (y_ps < 8)
```
[4.3572237]
[4.3572259]
```
        if (y_ps < Y_BOUND_1 + 3)
```
Replacement in crawl-ref/source/dungeon.cc at line 2239 [4.3429798]
B:BD[4.3572326] → [4.3572326:3572356]
```
        if (x_ps > (GXM - 8))
```
[4.3572326]
[4.3572356]
```
        if (x_ps > (X_BOUND_2 - 3))
```
Replacement in crawl-ref/source/dungeon.cc at line 2245 [4.3429798]
B:BD[4.3572424] → [4.3572424:3572454]
```
        if (y_ps > (GYM - 8))
```
[4.3572424]
[4.3572454]
```
        if (y_ps > (Y_BOUND_2 - 3))
```
Replacement in crawl-ref/source/dungeon.cc at line 2261 [4.3429798]
B:BD[4.3572898] → [4.3572898:3572924]
```
            if (x_ps < 9)
```
[4.3572898]
[4.3572924]
```
            if (x_ps < X_BOUND_1 + 4)
```
Replacement in crawl-ref/source/dungeon.cc at line 2267 [4.3429798]
B:BD[4.3573030] → [4.3573030:3573064]
```
            if (x_ps > (GXM - 9))
```
[4.3573030]
[4.3573064]
```
            if (x_ps > (X_BOUND_2 - 4))
```
Replacement in crawl-ref/source/dungeon.cc at line 2273 [4.3429798]
B:BD[4.3573171] → [4.3573171:3573197]
```
            if (y_ps < 9)
```
[4.3573171]
[4.3573197]
```
            if (y_ps < Y_BOUND_1 + 4)
```
Replacement in crawl-ref/source/dungeon.cc at line 2279 [4.3429798]
B:BD[4.3573303] → [4.3573303:3573337]
```
            if (y_ps > (GYM - 9))
```
[4.3573303]
[4.3573337]
```
            if (y_ps > (Y_BOUND_2 - 4))
```
Replacement in crawl-ref/source/dungeon.cc at line 2710 [4.3429798]
B:BD[4.3585184] → [4.3585184:3585250]
```
        if (sx < 6 || sx > (GXM - 7) || sy < 6 || sy > (GYM - 7))
```
[4.3585184]
[4.3585250]
```
        if (!in_bounds(sx, sy))
```

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

B:BD[4.3604469] → [4.3604469:3604565]

                pos_x = 10 + random2(GXM - 20);
                pos_y = 10 + random2(GYM - 20);

[4.3604469]

[4.3604565]

                pos_x = random_range(X_BOUND_1 + 1, X_BOUND_2 - 1);
                pos_y = random_range(Y_BOUND_1 + 1, Y_BOUND_2 - 1);

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

B:BD[13.8871] → [13.8871:8965]

        const int i = 6 + random2( GXM - 26 );
        const int j = 6 + random2( GYM - 26 );

[13.8871]

[13.8965]

        const int i = random_range(X_BOUND_1 + 1, X_BOUND_2 - 21);
        const int j = random_range(Y_BOUND_1 + 1, Y_BOUND_2 - 21);

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

B:BD[4.3639575] → [4.3639575:3639677]

            shop_place_x = random2(GXM - 20) + 10;
            shop_place_y = random2(GYM - 20) + 10;

[4.3639575]

[4.3639677]

            shop_place_x = random_range(X_BOUND_1 + 1, X_BOUND_2 - 1);
            shop_place_y = random_range(Y_BOUND_1 + 1, Y_BOUND_2 - 1);

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

B:BD[4.3644381] → [4.3644381:3644469]

                j = 10 + random2(GXM - 20);
                k = 10 + random2(GYM - 20);

[4.3644381]

[4.3644469]

                j = random_range(X_BOUND_1 + 1, X_BOUND_2 - 1);
                k = random_range(Y_BOUND_1 + 1, Y_BOUND_2 - 1);

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

B:BD[4.3645485] → [4.3645485:3645565]

            j = random2(GXM - 20) + 10;
            k = random2(GYM - 20) + 10;

[4.3645485]

[4.3645565]

            j = random_range(X_BOUND_1 + 1, X_BOUND_2 - 1);
            k = random_range(Y_BOUND_1 + 1, Y_BOUND_2 - 1);

Replacement in crawl-ref/source/defines.h at line 85 [4.3982910]
B:BD[14.159201] → [14.159201:159235]
```
#define MAPGEN_BORDER           6
```
[14.159201]
[5.1019187]
```
#define MAPGEN_BORDER           2
```
Replacement in crawl-ref/source/beam.cc at line 2605 [4.4128068]
∅:D[3.17229] → [4.4212919:4213000]
B:BD[4.4212919] → [4.4212919:4213000]
```
            || x <= 5 || x >= (GXM - 5)
            || y <= 5 || y >= (GYM - 5))
```
[3.17229]
[4.4213000]
```
            || !in_bounds(x, y))
```

Replacement in crawl-ref/source/beam.cc at line 2671 [4.4128068]

B:BD[3.17431] → [3.17431:17503]

            && !(x <= 6 || y <= 6 || x >= (GXM - 6) || y >= (GYM - 6)))

[3.17431]

[4.4213786]

            && in_bounds(x, y))

Deletion in crawl-ref/source/acr.cc at line 1576 [4.4397395]
∅:D[10.90637] → [4.4424553:4424554]
∅:D[5.1263108] → [4.4424553:4424554]
B:BD[4.4424553] → [4.4424553:4424554]
B:BD[4.4424554] → [5.1263109:1263142]
```
    FixedVector < int, 2 > plox;
```

Replacement in crawl-ref/source/acr.cc at line 1991 [4.4397395]

B:BD[4.4433232] → [4.4433232:4433253]

B:BD[4.4433253] → [5.1266287:1266317]

∅:D[12.18284] → [4.4433277:4433302]

∅:D[5.1266317] → [4.4433277:4433302]

B:BD[4.4433277] → [4.4433277:4433302]

B:BD[4.4433302] → [15.551:576]

∅:D[15.576] → [16.552246:552290]

∅:D[17.2804] → [16.552246:552290]

B:BD[16.552246] → [16.552246:552290]

        plox[0] = 0;
        show_map(plox, true);
        redraw_screen();
        if (plox[0] > 0)
            start_travel(plox[0], plox[1]);

[4.4433232]

[4.4433302]

        {
            coord_def pos;
            show_map(pos, true);
            redraw_screen();
            if (pos.x > 0)
                start_travel(pos.x, pos.y);
        }

First steps toward removing the need for 6-deep rock-wall padding around dungeon maps. This is likely to be buggy for a while.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.h at line 121 [4.13254]

Replacement in crawl-ref/source/view.cc at line 2724 [4.16817]

Replacement in crawl-ref/source/view.cc at line 2796 [4.16817]

Replacement in crawl-ref/source/view.cc at line 3101 [4.16817]

Replacement in crawl-ref/source/view.cc at line 3135 [4.16817]

Deletion in crawl-ref/source/spells3.cc at line 563 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 564 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 572 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 577 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 580 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 585 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 589 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 597 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 602 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 625 [4.531613]

Deletion in crawl-ref/source/spells3.cc at line 801 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 802 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 806 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 811 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 814 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 816 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 818 [4.531613]

Replacement in crawl-ref/source/spells3.cc at line 826 [4.531613]

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

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

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

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

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

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

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

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

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

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

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

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