fiddlerwoaroof/crawl - Change YMKHC3DZYD4GAQRPZHOZ6RPPNX7ZIEMHBZJ4OKF7HJEHO4SQR7LAC

Fix 2001524 and 1992140: shoals overriding critical features.

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

Created by haranp on September 21, 2008

YMKHC3DZYD4GAQRPZHOZ6RPPNX7ZIEMHBZJ4OKF7HJEHO4SQR7LAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/dungeon.cc at line 12 [3.3429798]
[3.3430951]
[4.391]
```
#include <list>
```

Replacement in crawl-ref/source/dungeon.cc at line 854 [3.3429798]

B:BD[5.3128] → [5.3128:3231]

        if (!player_in_branch(BRANCH_SWAMP)
            && !player_in_branch(BRANCH_SHOALS))
        {

[5.3128]

[6.15159]

        if (!player_in_branch(BRANCH_SWAMP) && !player_in_branch(BRANCH_SHOALS))

Deletion in crawl-ref/source/dungeon.cc at line 856 [3.3429798]
B:BD[6.15231] → [5.3232:3242]
```
        }
```
Replacement in crawl-ref/source/dungeon.cc at line 1283 [3.3429798]
∅:D[7.423] → [8.2306:2348]
∅:D[9.5019] → [8.2306:2348]
B:BD[8.2306] → [8.2306:2348]
```
    if (player_in_branch( BRANCH_SWAMP ))
```
[9.5019]
[6.16040]
```
    if (player_in_branch(BRANCH_SWAMP))
```
Replacement in crawl-ref/source/dungeon.cc at line 1286 [3.3429798]
B:BD[10.1414] → [6.16067:16108]
```
        _prepare_shoals( level_number );
```
[10.1414]
[8.2430]
```
        _prepare_shoals(level_number);
```

Replacement in crawl-ref/source/dungeon.cc at line 1293 [3.3429798]

B:BD[8.2451] → [8.2451:2530]

    if (!player_in_branch( BRANCH_DIS ) && !player_in_branch( BRANCH_VAULTS ))

[8.2451]

[6.16130]

    if (!player_in_branch(BRANCH_DIS) && !player_in_branch(BRANCH_VAULTS))

Replacement in crawl-ref/source/dungeon.cc at line 1314 [3.3429798]

B:BD[11.6991] → [11.6991:7057]

    if ( level_type == LEVEL_DUNGEON && your_branch().has_shops )

[11.6991]

[11.7057]

    if (level_type == LEVEL_DUNGEON && your_branch().has_shops)

Insertion in crawl-ref/source/dungeon.cc at line 1610 [3.3429798]

[6.18626]

[12.7930]

    }
}
typedef std::pair<coord_def, dungeon_feature_type> located_feature;
typedef std::list<located_feature> located_feature_list;
bool _is_critical_feature(dungeon_feature_type feat)
{
    return (feat == DNGN_ENTER_PORTAL_VAULT
            || feat == DNGN_ENTER_LABYRINTH
            || feat == DNGN_ENTER_SHOP);
}
static located_feature_list _save_critical_features()
{
    located_feature_list result;
    for (rectangle_iterator ri(1); ri; ++ri) 
        if (_is_critical_feature(grd(*ri)))
            result.push_back(located_feature(*ri, grd(*ri)));
    return result;
}
static void _restore_critical_features(const located_feature_list& lfl)
{
    for (located_feature_list::const_iterator ci = lfl.begin();
         ci != lfl.end(); ++ci)
    {
        grd(ci->first) = ci->second;

Insertion in crawl-ref/source/dungeon.cc at line 1645 [3.3429798]

[13.1644]

[14.11129]

    // Don't destroy portals, etc.
    const located_feature_list lfl = _save_critical_features();

Insertion in crawl-ref/source/dungeon.cc at line 1741 [3.3429798]
[12.9156]
[15.3270]
```
    // Put important things back.
    _restore_critical_features(lfl);
```

Insertion in crawl-ref/source/dungeon.cc at line 1746 [3.3429798]

[12.9240]

[15.3299]

        // Find an island to place the stairs up on.
        int j;
        const coord_def d1(1,0), d2(-1,0);
        for ( j = 0; j < num_islands; ++j )
        {
            if (!_is_critical_feature(grd(centres[j]))
                && !_is_critical_feature(grd(centres[j] + d1))
                && !_is_critical_feature(grd(centres[j] + d2)))
            {
                break;
            }
        }
        if (j == num_islands)
        {
            // Oh well.
            j = 0;
            mprf(MSGCH_ERROR, "Clobbering critical features: %d %d %d.",
                 grd(centres[j]), grd(centres[j] + d1), grd(centres[j] + d2));
        }

Replacement in crawl-ref/source/dungeon.cc at line 1766 [3.3429798]

∅:D[15.3344] → [16.3294:3362]

B:BD[13.2657] → [16.3294:3362]

∅:D[16.3362] → [13.2723:2792]

B:BD[13.2723] → [13.2723:2792]

B:BD[13.2792] → [17.627:697]

        grd[centres[0].x  ][centres[0].y] = DNGN_STONE_STAIRS_UP_I;
        grd[centres[0].x+1][centres[0].y] = DNGN_STONE_STAIRS_UP_II;
        grd[centres[0].x-1][centres[0].y] = DNGN_STONE_STAIRS_UP_III;

[15.3344]

[18.13501]

        grd[centres[j].x  ][centres[j].y] = DNGN_STONE_STAIRS_UP_I;
        grd[centres[j].x+1][centres[j].y] = DNGN_STONE_STAIRS_UP_II;
        grd[centres[j].x-1][centres[j].y] = DNGN_STONE_STAIRS_UP_III;

Replacement in crawl-ref/source/dungeon.cc at line 3585 [3.3429798]

B:BD[19.80300] → [2.2776:2777]

∅:D[2.2777] → [19.80309:80511]

B:BD[19.80309] → [19.80309:80511]


        mons_place(
            mgen_data::sleeper_at(
                one_chance_in(7) ? MONS_KILLER_BEE_LARVA
                                 : MONS_KILLER_BEE,
                *ri, MG_PATROLLING));

[19.80300]

[19.80511]

        mons_place(mgen_data::sleeper_at(
                       one_chance_in(7) ? MONS_KILLER_BEE_LARVA
                                        : MONS_KILLER_BEE,
                       *ri, MG_PATROLLING));

Replacement in crawl-ref/source/dungeon.cc at line 7359 [3.3429798]

B:BD[3.3695115] → [3.3695115:3695192]

    if (player_in_branch( BRANCH_CRYPT ) || player_in_branch( BRANCH_TOMB ))

[3.3695115]

[3.3695192]

    if (player_in_branch(BRANCH_CRYPT) || player_in_branch(BRANCH_TOMB))