fiddlerwoaroof/crawl - Change T5QIFBTUF5UQT66HK6U7FU7DTSFLK5MSTDFMJOSR2XPX7B32DGEQC

Unify check for unknown staircases in is_unknown_staircase.

Created by Robert Vollmert on October 17, 2009

T5QIFBTUF5UQT66HK6U7FU7DTSFLK5MSTDFMJOSR2XPX7B32DGEQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 57 [5.16817]
[3.544]
[4.2056]
```
#include "travel.h"
```

Replacement in crawl-ref/source/view.cc at line 402 [5.16817]

B:BD[6.147] → [2.6:81]

    if (feat_is_travelable_stair(feat) && !travel_cache.know_stair(where))

[6.147]

[6.227]

    if (is_unknown_stair(where, feat)
        && (you.your_level || feat_stair_direction(feat) == CMD_GO_DOWNSTAIRS)
        && you.where_are_you != BRANCH_VESTIBULE_OF_HELL)

Deletion in crawl-ref/source/view.cc at line 406 [5.16817]
B:BD[6.233] → [7.1104:1184]
∅:D[8.159] → [9.81:143]
∅:D[7.1184] → [9.81:143]
B:BD[9.81] → [9.81:143]
B:BD[9.143] → [10.7:17]
```
        if ((you.your_level || feat_stair_direction(feat) == CMD_GO_DOWNSTAIRS)
            && you.where_are_you != BRANCH_VESTIBULE_OF_HELL)
        {
```
Deletion in crawl-ref/source/view.cc at line 407 [5.16817]
B:BD[6.339] → [10.18:28]
```
        }
```

Replacement in crawl-ref/source/view.cc at line 684 [5.16817]

B:BD[11.8149] → [12.297:368]

∅:D[13.334] → [14.5387:5441]

∅:D[12.368] → [14.5387:5441]

B:BD[14.5387] → [14.5387:5441]

screen_buffer_t colour_code_map( const coord_def& p, bool item_colour,
                                 bool travel_colour )

[11.8149]

[5.36930]

screen_buffer_t colour_code_map(const coord_def& p, bool item_colour,
                                bool travel_colour)

Replacement in crawl-ref/source/view.cc at line 729 [5.16817]

∅:D[7.1421] → [6.1021:1092]

B:BD[6.1021] → [6.1021:1092]

    feature_colour = terrain_seen? fdef.seen_colour : fdef.map_colour;

[7.1421]

[6.1092]

    feature_colour = terrain_seen ? fdef.seen_colour : fdef.map_colour;

Replacement in crawl-ref/source/tutorial.cc at line 4223 [16.5936]

B:BD[15.5524] → [2.359:442]

            if (feat_is_travelable_stair(feat) && !travel_cache.know_stair(where))

[15.5524]

[17.7456]

            if (is_unknown_stair(where))

Replacement in crawl-ref/source/tutorial.cc at line 4256 [16.5936]

B:BD[18.35373] → [2.443:494]

∅:D[2.494] → [15.5772:5828]

B:BD[15.5772] → [15.5772:5828]

                if (feat_is_travelable_stair(feat)
                    && !travel_cache.know_stair(where))

[18.35373]

[15.5828]

                if (is_unknown_stair(where))

Replacement in crawl-ref/source/travel.h at line 62 [14.29464]

B:BD[19.209] → [19.209:295]

void set_exclude(const coord_def &p, int radius = LOS_RADIUS, bool autoexcl = false);

[19.209]

[20.494]

void set_exclude(const coord_def &p, int radius = LOS_RADIUS,
                 bool autoexcl = false);

Insertion in crawl-ref/source/travel.h at line 78 [14.29464]

[2.549]

[14.30490]

bool is_unknown_stair(const coord_def &p,
    dungeon_feature_type remembered_feat = NUM_REAL_FEATURES);

Insertion in crawl-ref/source/travel.cc at line 229 [14.39949]

[14.44695]

[14.44893]

bool is_unknown_stair(const coord_def &p, dungeon_feature_type remembered_feat)
{
    dungeon_feature_type feat = (remembered_feat == NUM_REAL_FEATURES)
                                    ? env.grid(p) : feat;
    return (feat_is_travelable_stair(feat) && !travel_cache.know_stair(p));
}

Replacement in crawl-ref/source/tilepick.cc at line 70 [3.96318]

B:BD[21.578] → [21.578:651]

B:BD[21.651] → [2.1453:1525]

∅:D[2.1525] → [22.644:692]

B:BD[22.644] → [22.644:692]

∅:D[22.692] → [21.766:780]

B:BD[21.766] → [21.766:780]


            const coord_def gc(x,y);
            int object = grd(gc);
            if (!feat_is_travelable_stair((dungeon_feature_type)object)
                || travel_cache.know_stair(gc))
            {

[21.578]

[21.780]

            if (!is_unkown_stair(coord_def(x,y)))

Deletion in crawl-ref/source/tilepick.cc at line 72 [3.96318]
B:BD[21.842] → [21.842:856]
```
            }
```

Replacement in crawl-ref/source/tilepick.cc at line 4540 [3.96318]

B:BD[23.2495] → [2.1526:1610]

∅:D[2.1610] → [23.2574:2658]

B:BD[23.2574] → [23.2574:2658]

                    else if (feat_is_travelable_stair((dungeon_feature_type)object)
                             && !travel_cache.know_stair(gc))
                    {

[23.2495]

[23.2658]

                    else if (is_unkown_stair(gc))

Deletion in crawl-ref/source/tilepick.cc at line 4542 [3.96318]
B:BD[23.2709] → [23.2709:2731]
```
                    }
```

Replacement in crawl-ref/source/menu.cc at line 836 [14.261322]

B:BD[24.5582] → [2.9198:9275]

    if (feat_is_travelable_stair(grd(pos)) && !travel_cache.know_stair(pos))

[24.5582]

[24.5654]

    if (is_unknown_stair(pos))

Replacement in crawl-ref/source/directn.cc at line 696 [5.3697945]

B:BD[24.7861] → [2.9630:9711]

            if (feat_is_travelable_stair(grd(c)) && !travel_cache.know_stair(c))

[24.7861]

[24.7937]

            if (is_unknown_stair(c))