fiddlerwoaroof/crawl - Change X5DCNPFXJAWWTCTVQGZN4PTTWUJIUE4JPTXH3WVWCO2DW67MXWYAC

Include secret doors in door-clustering (gates) when opening doors.

In otherwords, if there's a line of secret doors with just one non-secret closed door among them and the non-secret door is opened, open up all the secret doors.

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

Created by zelgadis on June 11, 2008

X5DCNPFXJAWWTCTVQGZN4PTTWUJIUE4JPTXH3WVWCO2DW67MXWYAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/terrain.h at line 49 [5.24828]

[4.328]

[2.212]

void find_connected_range(coord_def d, dungeon_feature_type ft_min,
                          dungeon_feature_type ft_max,
                          std::set<coord_def>& out);

Insertion in crawl-ref/source/terrain.cc at line 247 [5.26938]

[5.32648]

[2.633]

// Find all connected cells containing ft_min to ft_max, starting at d.
void find_connected_range(coord_def d, dungeon_feature_type ft_min,
                          dungeon_feature_type ft_max,
                          std::set<coord_def>& out)
{
    if (grd[d.x][d.y] < ft_min || grd[d.x][d.y] > ft_max) return;
    if (out.insert(d).second)
    {
        find_connected_range(coord_def(d.x+1, d.y), ft_min, ft_max, out);
        find_connected_range(coord_def(d.x-1, d.y), ft_min, ft_max, out);
        find_connected_range(coord_def(d.x, d.y+1), ft_min, ft_max, out);
        find_connected_range(coord_def(d.x, d.y-1), ft_min, ft_max, out);
    }
}

Replacement in crawl-ref/source/acr.cc at line 3687 [7.4397395]

B:BD[6.3279] → [2.4583:4658]

        find_connected_identical(coord_def(dx,dy), grd[dx][dy], all_door);

[6.3279]

[2.4658]

        find_connected_range(coord_def(dx,dy), DNGN_CLOSED_DOOR,
                             DNGN_SECRET_DOOR, all_door);

Insertion in crawl-ref/source/acr.cc at line 3718 [7.4397395]
[7.4466280]
[6.3797]
```
        bool seen_secret = false;
```
Deletion in crawl-ref/source/acr.cc at line 3723 [7.4397395]
B:BD[6.3949] → [6.3949:3995]
```
            grd[dc.x][dc.y] = DNGN_OPEN_DOOR;
```

Insertion in crawl-ref/source/acr.cc at line 3732 [7.4397395]

[3.2888]

                if (!seen_secret && grd[dc.x][dc.y] == DNGN_SECRET_DOOR)
                {
                    seen_secret = true;
                    dungeon_feature_type secret
                        = grid_secret_door_appearance(dc.x, dc.y);
                    mprf("That %s was a secret door!",
                         feature_description(secret, NUM_TRAPS, false,
                                             DESC_PLAIN, false).c_str());
                }

Insertion in crawl-ref/source/acr.cc at line 3742 [7.4397395]
[3.2902]
[6.3995]
```
            grd[dc.x][dc.y] = DNGN_OPEN_DOOR;
```