fiddlerwoaroof/crawl - Change RZ5DEWTN3TRCTIGQU6MQE5RYFW5FMQVW6VOD525W3PKIX3KZFGZAC

More renaming and reorganization of feature checks.

There were a couple of functions is_something(dgn_feature_type feat) defined in travel.cc that were otherwise independent of travel. For consistency, move these to terrain.cc and rename to feat_is_something.

One might also consider renaming the various feat_is_whatever functions to just is_whatever.

Created by Robert Vollmert on October 17, 2009

RZ5DEWTN3TRCTIGQU6MQE5RYFW5FMQVW6VOD525W3PKIX3KZFGZAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 401 [7.16817]

B:BD[5.147] → [6.1390:1460]

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

[5.147]

[5.227]

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

Replacement in crawl-ref/source/view.cc at line 1590 [7.16817]

B:BD[8.1473] → [8.1473:1520]

B:BD[8.1520] → [9.291:356]

    const dungeon_feature_type grid = grd(gp);
    if (Options.feature_item_brand && is_critical_feature(grid))

[8.1473]

[9.356]

    const dungeon_feature_type feat = grd(gp);
    if (Options.feature_item_brand && is_critical_feature(feat))

Replacement in crawl-ref/source/view.cc at line 1593 [7.16817]

B:BD[9.394] → [4.1868:1928]

    else if (Options.trap_item_brand && feat_is_trap(grid))

[9.394]

[10.279]

    else if (Options.trap_item_brand && feat_is_trap(feat))

Replacement in crawl-ref/source/view.cc at line 1598 [7.16817]

B:BD[11.65] → [11.65:111]

        ecol = (grid == DNGN_SHALLOW_WATER) ?

[11.65]

[11.111]

        ecol = (feat == DNGN_SHALLOW_WATER) ?

Replacement in crawl-ref/source/view.cc at line 1607 [7.16817]
B:BD[12.1497] → [12.1497:1521]
```
    if (is_stair(grid))
```
[12.1497]
[12.1521]
```
    if (feat_is_stair(feat))
```

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

B:BD[13.5524] → [13.5524:5602]

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

[13.5524]

[15.7456]

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

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

B:BD[16.35373] → [13.5726:5772]

                if (is_travelable_stair(feat)

[16.35373]

[13.5772]

                if (feat_is_travelable_stair(feat)

Deletion in crawl-ref/source/travel.h at line 69 [18.29464]

B:BD[17.1424] → [4.2497:2682]

bool is_stair(dungeon_feature_type feat);
bool is_travelable_stair(dungeon_feature_type feat);
bool is_escape_hatch(dungeon_feature_type feat);
bool is_gate(dungeon_feature_type feat);

Deletion in crawl-ref/source/travel.h at line 70 [18.29464]
B:BD[4.2733] → [4.2733:2775]
```
bool is_altar(dungeon_feature_type feat);
```
Deletion in crawl-ref/source/travel.h at line 74 [18.29464]
B:BD[19.199] → [4.2799:2847]
```
bool is_traversable(dungeon_feature_type feat);
```
Insertion in crawl-ref/source/travel.h at line 76 [18.29464]
[20.211]
[18.30490]
```
bool feat_is_traversable(dungeon_feature_type feat);
```
Deletion in crawl-ref/source/travel.cc at line 217 [18.39949]
∅:D[21.417] → [18.44154:44218]
∅:D[22.910] → [18.44154:44218]
B:BD[18.44154] → [18.44154:44218]
B:BD[18.44218] → [23.822:863]
∅:D[23.863] → [18.44259:44261]
∅:D[24.86352] → [18.44259:44261]
B:BD[18.44259] → [18.44259:44261]
B:BD[18.44261] → [4.3084:3131]
```
}
// Returns true if the dungeon feature supplied is an altar.
bool is_altar(dungeon_feature_type grid)
{
    return feat_altar_god(grid) != GOD_NO_GOD;
```
Deletion in crawl-ref/source/travel.cc at line 220 [18.39949]
∅:D[24.86435] → [18.44371:44373]
B:BD[18.44371] → [18.44371:44373]
B:BD[18.44373] → [25.229:258]
∅:D[25.258] → [18.44409:44412]
B:BD[18.44409] → [18.44409:44412]
B:BD[18.44412] → [23.864:919]
```
{
    return is_altar(grd(c));
}
inline bool is_player_altar(dungeon_feature_type grid)
```

Replacement in crawl-ref/source/travel.cc at line 221 [18.39949]

B:BD[18.44462] → [18.44462:44517]

B:BD[18.44517] → [26.135:174]

B:BD[26.174] → [4.3132:3186]

    // An ugly hack, but that's what religion.cc does.
    return (you.religion != GOD_NO_GOD
            && feat_altar_god(grid) == you.religion);

[18.44462]

[18.44596]

    return feat_is_altar(grd(c));

Replacement in crawl-ref/source/travel.cc at line 226 [18.39949]
B:BD[18.44649] → [25.259:295]
```
    return is_player_altar(grd(c));
```
[18.44649]
[18.44692]
```
    return feat_is_player_altar(grd(c));
```
Replacement in crawl-ref/source/travel.cc at line 261 [18.39949]
∅:D[26.294] → [27.241:288]
B:BD[18.45737] → [27.241:288]
```
bool is_traversable(dungeon_feature_type grid)
```
[26.294]
[18.45784]
```
bool feat_is_traversable(dungeon_feature_type grid)
```

Replacement in crawl-ref/source/travel.cc at line 625 [18.39949]

B:BD[28.1030] → [28.1030:1098]

    return (is_traversable(static_cast<dungeon_feature_type>(grid))

[18.51870]

[18.51904]

    return (feat_is_traversable(static_cast<dungeon_feature_type>(grid))

Deletion in crawl-ref/source/travel.cc at line 780 [18.39949]

B:BD[24.87445] → [24.87445:87448]

B:BD[24.87448] → [29.229:309]

∅:D[29.309] → [30.972:1014]

B:BD[24.87448] → [30.972:1014]

∅:D[30.1014] → [18.59806:59808]

B:BD[18.59806] → [18.59806:59808]

B:BD[18.59808] → [31.178:237]

∅:D[31.237] → [18.60177:60180]

∅:D[32.2516] → [18.60177:60180]

B:BD[18.60177] → [18.60177:60180]

B:BD[18.60180] → [29.310:433]

∅:D[29.433] → [30.1015:1068]

∅:D[32.2589] → [30.1015:1068]

B:BD[18.60259] → [30.1015:1068]

∅:D[30.1068] → [18.60300:60327]

B:BD[18.60300] → [18.60300:60327]

B:BD[18.60353] → [18.60353:60461]

B:BD[18.60461] → [22.1011:1044]

∅:D[22.1044] → [18.60493:60595]

B:BD[18.60493] → [18.60493:60595]

B:BD[18.60595] → [22.1045:1076]

B:BD[22.1076] → [2.135:186]

∅:D[2.186] → [18.60625:61117]

∅:D[22.1076] → [18.60625:61117]

B:BD[18.60625] → [18.60625:61117]

B:BD[18.61117] → [33.372:400]

∅:D[34.293] → [18.61117:61574]

∅:D[33.400] → [18.61117:61574]

B:BD[18.61117] → [18.61117:61574]

B:BD[18.61574] → [33.401:435]

B:BD[33.435] → [35.3671:3694]

∅:D[35.3694] → [18.61595:61608]

B:BD[18.61595] → [18.61595:61608]

B:BD[18.61608] → [35.3695:3719]

∅:D[35.3719] → [18.61630:61636]

B:BD[18.61630] → [18.61630:61636]

B:BD[18.61636] → [36.911:914]

B:BD[36.914] → [37.280:554]

∅:D[37.554] → [31.238:352]

B:BD[36.914] → [31.238:352]

B:BD[31.352] → [38.229:539]

∅:D[38.539] → [31.352:561]

B:BD[31.352] → [31.352:561]

B:BD[31.561] → [39.135:202]

B:BD[39.202] → [29.434:516]

B:BD[29.516] → [38.540:565]

∅:D[38.565] → [29.516:629]

B:BD[29.516] → [29.516:629]

∅:D[29.629] → [35.3720:3743]

B:BD[39.202] → [35.3720:3743]

∅:D[35.3743] → [31.582:595]

B:BD[31.582] → [31.582:595]

B:BD[31.595] → [35.3744:3768]

∅:D[35.3768] → [31.617:623]

B:BD[31.617] → [31.617:623]

}
// Returns true if the given dungeon feature is a stair, i.e., a level
// exit.
bool is_stair(dungeon_feature_type gridc)
{
    return (is_travelable_stair(gridc) || is_gate(gridc));
}
// Returns true if the given dungeon feature is a travelable stair, i.e.,
// it's a level exit with a consistent endpoint.
bool is_travelable_stair(dungeon_feature_type gridc)
{
    switch (gridc)
    {
    case DNGN_STONE_STAIRS_DOWN_I:
    case DNGN_STONE_STAIRS_DOWN_II:
    case DNGN_STONE_STAIRS_DOWN_III:
    case DNGN_ESCAPE_HATCH_DOWN:
    case DNGN_STONE_STAIRS_UP_I:
    case DNGN_STONE_STAIRS_UP_II:
    case DNGN_STONE_STAIRS_UP_III:
    case DNGN_ESCAPE_HATCH_UP:
    case DNGN_ENTER_HELL:
    case DNGN_EXIT_HELL:
    case DNGN_ENTER_DIS:
    case DNGN_ENTER_GEHENNA:
    case DNGN_ENTER_COCYTUS:
    case DNGN_ENTER_TARTARUS:
    case DNGN_ENTER_ORCISH_MINES:
    case DNGN_ENTER_HIVE:
    case DNGN_ENTER_LAIR:
    case DNGN_ENTER_SLIME_PITS:
    case DNGN_ENTER_VAULTS:
    case DNGN_ENTER_CRYPT:
    case DNGN_ENTER_HALL_OF_BLADES:
    case DNGN_ENTER_ZOT:
    case DNGN_ENTER_TEMPLE:
    case DNGN_ENTER_SNAKE_PIT:
    case DNGN_ENTER_ELVEN_HALLS:
    case DNGN_ENTER_TOMB:
    case DNGN_ENTER_SWAMP:
    case DNGN_ENTER_SHOALS:
    case DNGN_RETURN_FROM_ORCISH_MINES:
    case DNGN_RETURN_FROM_HIVE:
    case DNGN_RETURN_FROM_LAIR:
    case DNGN_RETURN_FROM_SLIME_PITS:
    case DNGN_RETURN_FROM_VAULTS:
    case DNGN_RETURN_FROM_CRYPT:
    case DNGN_RETURN_FROM_HALL_OF_BLADES:
    case DNGN_RETURN_FROM_ZOT:
    case DNGN_RETURN_FROM_TEMPLE:
    case DNGN_RETURN_FROM_SNAKE_PIT:
    case DNGN_RETURN_FROM_ELVEN_HALLS:
    case DNGN_RETURN_FROM_TOMB:
    case DNGN_RETURN_FROM_SWAMP:
    case DNGN_RETURN_FROM_SHOALS:
        return (true);
    default:
        return (false);
    }
}
// Returns true if the given dungeon feature is an escape hatch.
bool is_escape_hatch(dungeon_feature_type gridc)
{
    switch (gridc)
    {
    case DNGN_ESCAPE_HATCH_DOWN:
    case DNGN_ESCAPE_HATCH_UP:
        return (true);
    default:
        return (false);
    }
}
// Returns true if the given dungeon feature can be considered a gate.
bool is_gate(dungeon_feature_type gridc)
{
    // Make up staircases in hell appear as gates.
    if (player_in_hell())
    {
        switch (gridc)
        {
        case DNGN_STONE_STAIRS_UP_I:
        case DNGN_STONE_STAIRS_UP_II:
        case DNGN_STONE_STAIRS_UP_III:
            return (true);
        default:
            break;
        }
    }
    switch (gridc)
    {
    case DNGN_ENTER_ABYSS:
    case DNGN_EXIT_ABYSS:
    case DNGN_ENTER_LABYRINTH:
    case DNGN_ENTER_PANDEMONIUM:
    case DNGN_EXIT_PANDEMONIUM:
    case DNGN_TRANSIT_PANDEMONIUM:
    case DNGN_ENTER_PORTAL_VAULT:
    case DNGN_EXIT_PORTAL_VAULT:
    case DNGN_ENTER_ZOT:
    case DNGN_RETURN_FROM_ZOT:
    case DNGN_ENTER_HELL:
    case DNGN_EXIT_HELL:
    case DNGN_ENTER_DIS:
    case DNGN_ENTER_GEHENNA:
    case DNGN_ENTER_COCYTUS:
    case DNGN_ENTER_TARTARUS:
        return (true);
    default:
        return (false);
    }

Replacement in crawl-ref/source/travel.cc at line 987 [18.39949]
∅:D[40.1763] → [41.239:285]
B:BD[41.239] → [41.239:285]
```
                   && is_traversable(feature)
```
[40.1763]
[41.285]
```
                   && feat_is_traversable(feature)
```

Replacement in crawl-ref/source/travel.cc at line 1888 [18.39949]

B:BD[42.1527] → [42.1527:1578]

                || !is_traversable(grd(new_dest)))

[42.1527]

[42.1578]

                || !feat_is_traversable(grd(new_dest)))

Replacement in crawl-ref/source/travel.cc at line 3526 [18.39949]

B:BD[6.12801] → [6.12801:12853]

        const dungeon_feature_type grid = grd(*ri);

[6.12801]

[6.12853]

        const dungeon_feature_type feat = grd(*ri);

Replacement in crawl-ref/source/travel.cc at line 3530 [18.39949]
B:BD[6.12939] → [6.12939:12980]
```
            && is_travelable_stair(grid)
```
[6.12939]
[6.12980]
```
            && feat_is_travelable_stair(feat)
```

Replacement in crawl-ref/source/travel.cc at line 4157 [18.39949]

B:BD[23.1419] → [23.1419:1486]

                                        dungeon_feature_type grid)

[23.1419]

[43.3353]

                                        dungeon_feature_type feat)

Replacement in crawl-ref/source/travel.cc at line 4159 [18.39949]
B:BD[43.3355] → [43.3355:3399]
```
    if (grid == DNGN_ENTER_SHOP && ES_shop)
```
[43.3355]
[43.3399]
```
    if (feat == DNGN_ENTER_SHOP && ES_shop)
```

Replacement in crawl-ref/source/travel.cc at line 4161 [18.39949]

B:BD[43.3405] → [44.4754:4823]

        shops.push_back( named_thing<int>( shop_name(pos), grid ) );

[43.3405]

[43.3483]

        shops.push_back(named_thing<int>( shop_name(pos), feat));

Replacement in crawl-ref/source/travel.cc at line 4164 [18.39949]
B:BD[43.3518] → [43.3518:3559]
```
    else if (is_stair(grid) && ES_stair)
```
[43.3518]
[43.3559]
```
    else if (feat_is_stair(feat) && ES_stair)
```
Replacement in crawl-ref/source/travel.cc at line 4170 [18.39949]
B:BD[43.3718] → [4.3767:3815]
```
    else if (feat_is_portal(grid) && ES_portal)
```
[43.3718]
[45.300]
```
    else if (feat_is_portal(feat) && ES_portal)
```
Replacement in crawl-ref/source/travel.cc at line 4176 [18.39949]
∅:D[45.447] → [46.23794:23822]
B:BD[43.3718] → [46.23794:23822]
```
    else if (is_altar(grid)
```
[45.447]
[46.23822]
```
    else if (feat_is_altar(feat)
```
Replacement in crawl-ref/source/tilereg.cc at line 1225 [48.54399]
B:BD[47.740] → [4.3931:3966]
```
                if (is_altar(feat)
```
[47.740]
[4.3966]
```
                if (feat_is_altar(feat)
```
Replacement in crawl-ref/source/tilereg.cc at line 1353 [48.54399]
B:BD[47.1241] → [4.4208:4244]
```
            else if (is_gate(feat))
```
[47.1241]
[47.1277]
```
            else if (feat_is_gate(feat))
```

Replacement in crawl-ref/source/tilereg.cc at line 1363 [48.54399]

B:BD[47.1500] → [4.4245:4323]

        else if (is_altar(feat) && player_can_join_god(feat_altar_god(feat)))

[47.1500]

[47.1578]

        else if (feat_is_altar(feat) && player_can_join_god(feat_altar_god(feat)))

Replacement in crawl-ref/source/tilepick.cc at line 74 [12.96318]

B:BD[49.651] → [50.577:644]

            if (!is_travelable_stair((dungeon_feature_type)object)

[49.651]

[50.644]

            if (!feat_is_travelable_stair((dungeon_feature_type)object)

Replacement in crawl-ref/source/tilepick.cc at line 4547 [12.96318]

B:BD[51.2495] → [51.2495:2574]

                    else if (is_travelable_stair((dungeon_feature_type)object)

[51.2495]

[51.2574]

                    else if (feat_is_travelable_stair((dungeon_feature_type)object)

Insertion in crawl-ref/source/terrain.h at line 21 [52.24828]
[52.25568]
[52.25568]
```
bool cell_is_solid(int x, int y);
bool cell_is_solid(const coord_def &c);
```
Deletion in crawl-ref/source/terrain.h at line 27 [52.24828]
B:BD[4.4814] → [4.4814:4888]
```
bool cell_is_solid(int x, int y);
bool cell_is_solid(const coord_def &c);
```

Insertion in crawl-ref/source/terrain.h at line 38 [52.24828]

[4.5490]

[53.315]


bool feat_is_stair(dungeon_feature_type feat);
bool feat_is_travelable_stair(dungeon_feature_type feat);
bool feat_is_escape_hatch(dungeon_feature_type feat);
bool feat_is_gate(dungeon_feature_type feat);

Insertion in crawl-ref/source/terrain.h at line 52 [52.24828]

[54.806]

[4.5775]

bool feat_is_altar(dungeon_feature_type feat);
bool feat_is_player_altar(dungeon_feature_type grid);

Deletion in crawl-ref/source/terrain.cc at line 96 [52.26938]
B:BD[52.28285] → [4.6505:6558]
∅:D[22.1633] → [52.28336:28338]
∅:D[4.6558] → [52.28336:28338]
B:BD[52.28336] → [52.28336:28338]
B:BD[52.28338] → [4.6559:6636]
∅:D[22.1711] → [52.28490:28493]
∅:D[4.6636] → [52.28490:28493]
B:BD[52.28490] → [52.28490:28493]
```
bool feat_is_escape_hatch(dungeon_feature_type feat)
{
    return (feat == DNGN_ESCAPE_HATCH_UP || feat == DNGN_ESCAPE_HATCH_DOWN);
}
```

Insertion in crawl-ref/source/terrain.cc at line 117 [52.26938]

[4.6838]

[52.28921]

}
// Returns true if the given dungeon feature is a stair, i.e., a level
// exit.
bool feat_is_stair(dungeon_feature_type gridc)
{
    return (feat_is_travelable_stair(gridc) || feat_is_gate(gridc));
}
// Returns true if the given dungeon feature is a travelable stair, i.e.,
// it's a level exit with a consistent endpoint.
bool feat_is_travelable_stair(dungeon_feature_type feat)
{
    switch (feat)
    {
    case DNGN_STONE_STAIRS_DOWN_I:
    case DNGN_STONE_STAIRS_DOWN_II:
    case DNGN_STONE_STAIRS_DOWN_III:
    case DNGN_ESCAPE_HATCH_DOWN:
    case DNGN_STONE_STAIRS_UP_I:
    case DNGN_STONE_STAIRS_UP_II:
    case DNGN_STONE_STAIRS_UP_III:
    case DNGN_ESCAPE_HATCH_UP:
    case DNGN_ENTER_HELL:
    case DNGN_EXIT_HELL:
    case DNGN_ENTER_DIS:
    case DNGN_ENTER_GEHENNA:
    case DNGN_ENTER_COCYTUS:
    case DNGN_ENTER_TARTARUS:
    case DNGN_ENTER_ORCISH_MINES:
    case DNGN_ENTER_HIVE:
    case DNGN_ENTER_LAIR:
    case DNGN_ENTER_SLIME_PITS:
    case DNGN_ENTER_VAULTS:
    case DNGN_ENTER_CRYPT:
    case DNGN_ENTER_HALL_OF_BLADES:
    case DNGN_ENTER_ZOT:
    case DNGN_ENTER_TEMPLE:
    case DNGN_ENTER_SNAKE_PIT:
    case DNGN_ENTER_ELVEN_HALLS:
    case DNGN_ENTER_TOMB:
    case DNGN_ENTER_SWAMP:
    case DNGN_ENTER_SHOALS:
    case DNGN_RETURN_FROM_ORCISH_MINES:
    case DNGN_RETURN_FROM_HIVE:
    case DNGN_RETURN_FROM_LAIR:
    case DNGN_RETURN_FROM_SLIME_PITS:
    case DNGN_RETURN_FROM_VAULTS:
    case DNGN_RETURN_FROM_CRYPT:
    case DNGN_RETURN_FROM_HALL_OF_BLADES:
    case DNGN_RETURN_FROM_ZOT:
    case DNGN_RETURN_FROM_TEMPLE:
    case DNGN_RETURN_FROM_SNAKE_PIT:
    case DNGN_RETURN_FROM_ELVEN_HALLS:
    case DNGN_RETURN_FROM_TOMB:
    case DNGN_RETURN_FROM_SWAMP:
    case DNGN_RETURN_FROM_SHOALS:
        return (true);
    default:
        return (false);
    }

Insertion in crawl-ref/source/terrain.cc at line 180 [52.26938]

[52.28924]

[4.6839]

// Returns true if the given dungeon feature is an escape hatch.
bool feat_is_escape_hatch(dungeon_feature_type feat)
{
    switch (feat)
    {
    case DNGN_ESCAPE_HATCH_DOWN:
    case DNGN_ESCAPE_HATCH_UP:
        return (true);
    default:
        return (false);
    }
}
// Returns true if the given dungeon feature can be considered a gate.
bool feat_is_gate(dungeon_feature_type feat)
{
    // Make up staircases in hell appear as gates.
    if (player_in_hell())
    {
        switch (feat)
        {
        case DNGN_STONE_STAIRS_UP_I:
        case DNGN_STONE_STAIRS_UP_II:
        case DNGN_STONE_STAIRS_UP_III:
            return (true);
        default:
            break;
        }
    }
    switch (feat)
    {
    case DNGN_ENTER_ABYSS:
    case DNGN_EXIT_ABYSS:
    case DNGN_ENTER_LABYRINTH:
    case DNGN_ENTER_PANDEMONIUM:
    case DNGN_EXIT_PANDEMONIUM:
    case DNGN_TRANSIT_PANDEMONIUM:
    case DNGN_ENTER_PORTAL_VAULT:
    case DNGN_EXIT_PORTAL_VAULT:
    case DNGN_ENTER_ZOT:
    case DNGN_RETURN_FROM_ZOT:
    case DNGN_ENTER_HELL:
    case DNGN_EXIT_HELL:
    case DNGN_ENTER_DIS:
    case DNGN_ENTER_GEHENNA:
    case DNGN_ENTER_COCYTUS:
    case DNGN_ENTER_TARTARUS:
        return (true);
    default:
        return (false);
    }
}

Insertion in crawl-ref/source/terrain.cc at line 391 [52.26938]

[52.32435]

[4.8839]

// Returns true if the dungeon feature supplied is an altar.
bool feat_is_altar(dungeon_feature_type grid)
{
    return feat_altar_god(grid) != GOD_NO_GOD;
}
bool feat_is_player_altar(dungeon_feature_type grid)
{
    // An ugly hack, but that's what religion.cc does.
    return (you.religion != GOD_NO_GOD
            && feat_altar_god(grid) == you.religion);
}

Replacement in crawl-ref/source/terrain.cc at line 585 [52.26938]

B:BD[52.35049] → [4.9336:9401]

    return (is_traversable(feat) && !feat_destroys_items(feat));

[52.35049]

[52.35114]

    return (feat_is_traversable(feat) && !feat_destroys_items(feat));

Replacement in crawl-ref/source/stuff.cc at line 1659 [7.224557]
B:BD[55.367] → [55.367:395]
```
        if (is_stair(feat))
```
[55.367]
[7.242338]
```
        if (feat_is_stair(feat))
```
Replacement in crawl-ref/source/overmap.cc at line 775 [7.1070017]
B:BD[56.8459] → [6.41444:41478]
```
    if (is_stair(grd(you.pos())))
```
[56.8459]
[56.8504]
```
    if (feat_is_stair(grd(you.pos())))
```
Replacement in crawl-ref/source/monstuff.cc at line 3432 [7.1396662]
B:BD[57.2728] → [57.2728:2756]
```
    if (is_stair(grd(pos)))
```
[57.2728]
[57.2756]
```
    if (feat_is_stair(grd(pos)))
```

Replacement in crawl-ref/source/monstuff.cc at line 3496 [7.1396662]

B:BD[58.2766] → [59.2637:2693]

    const dungeon_feature_type gridc = grd(mon->pos());

[58.2766]

[3.2646]

    const dungeon_feature_type feat = grd(mon->pos());

Replacement in crawl-ref/source/monstuff.cc at line 3499 [7.1396662]
B:BD[60.3429] → [29.3038:3062]
```
    if (is_gate(gridc))
```
[61.2689]
[29.3062]
```
    if (feat_is_gate(feat))
```
Replacement in crawl-ref/source/monstuff.cc at line 3501 [7.1396662]
B:BD[29.3128] → [29.3128:3169]
```
    else if (is_travelable_stair(gridc))
```
[29.3128]
[62.2742]
```
    else if (feat_is_travelable_stair(feat))
```

Replacement in crawl-ref/source/monstuff.cc at line 3503 [7.1396662]

B:BD[62.2748] → [4.16702:16758]

        command_type dir = feat_stair_direction(gridc);

[62.2748]

[60.3530]

        command_type dir = feat_stair_direction(feat);

Replacement in crawl-ref/source/monstuff.cc at line 3506 [7.1396662]

∅:D[37.3048] → [60.3610:3720]

B:BD[60.3610] → [60.3610:3720]

B:BD[60.3720] → [37.3049:3222]

                dir == CMD_GO_UPSTAIRS   ? "goes up" :
                dir == CMD_GO_DOWNSTAIRS ? "goes down"
                                         : "takes",
                is_escape_hatch(gridc)   ? "escape hatch"
                                         : "stairs").c_str());

[37.3048]

[60.3782]

                dir == CMD_GO_UPSTAIRS     ? "goes up" :
                dir == CMD_GO_DOWNSTAIRS   ? "goes down"
                                           : "takes",
                feat_is_escape_hatch(feat) ? "escape hatch"
                                           : "stairs").c_str());

Replacement in crawl-ref/source/monplace.cc at line 672 [7.1641732]
B:BD[63.5260] → [63.5260:5292]
```
            if (is_stair(feat))
```
[63.5260]
[63.5292]
```
            if (feat_is_stair(feat))
```
Replacement in crawl-ref/source/misc.cc at line 1316 [7.1933596]
B:BD[38.5662] → [38.5662:5691]
```
    else if (is_gate(stair))
```
[38.5662]
[38.5691]
```
    else if (feat_is_gate(stair))
```
Replacement in crawl-ref/source/misc.cc at line 1779 [7.1933596]
∅:D[4.22194] → [38.6348:6381]
B:BD[38.6348] → [38.6348:6381]
```
        && !is_gate(stair_find))
```
[4.22194]
[7.1944906]
```
        && !feat_is_gate(stair_find))
```

Replacement in crawl-ref/source/misc.cc at line 1861 [7.1933596]

B:BD[7.1947541] → [38.6382:6448]

    if (you.flight_mode() == FL_LEVITATE && !is_gate(stair_find))

[7.1947541]

[64.1351]

    if (you.flight_mode() == FL_LEVITATE && !feat_is_gate(stair_find))

Replacement in crawl-ref/source/misc.cc at line 1863 [7.1933596]

B:BD[64.1424] → [38.6449:6515]

    else if (you.flight_mode() == FL_FLY && !is_gate(stair_find))

[64.1424]

[65.3647]

    else if (you.flight_mode() == FL_FLY && !feat_is_gate(stair_find))

Replacement in crawl-ref/source/misc.cc at line 2093 [7.1933596]
B:BD[66.4606] → [66.4606:4639]
```
        && !is_gate(stair_find))
```
[66.4606]
[7.1949766]
```
        && !feat_is_gate(stair_find))
```
Insertion in crawl-ref/source/menu.cc at line 24 [18.261322]
[67.5096]
[67.5096]
```
 #include "terrain.h"
```

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

B:BD[67.5582] → [67.5582:5654]

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

[67.5582]

[67.5654]

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

Replacement in crawl-ref/source/dungeon.h at line 311 [7.3428186]
B:BD[68.9338] → [4.25295:25325]
```
    if (!is_traversable(feat)
```
[68.9338]
[4.25325]
```
    if (!feat_is_traversable(feat)
```

Replacement in crawl-ref/source/dungeon.cc at line 5246 [7.3429798]

B:BD[69.9105] → [69.9105:9167]

        if (early_exit && at != from && is_traversable(feat))

[69.9105]

[70.9951]

        if (early_exit && at != from && feat_is_traversable(feat))

Replacement in crawl-ref/source/dungeon.cc at line 5249 [7.3429798]

B:BD[71.978] → [69.9168:9233]

        if (unforbidden(at, MMT_VAULT) && !is_traversable(feat))

[71.978]

[71.1018]

        if (unforbidden(at, MMT_VAULT) && !feat_is_traversable(feat))

Replacement in crawl-ref/source/dungeon.cc at line 7701 [7.3429798]

B:BD[72.3799] → [4.26730:26785]

    return (is_traversable(feat) || feat_is_trap(feat)

[72.3799]

[72.3854]

    return (feat_is_traversable(feat) || feat_is_trap(feat)

Replacement in crawl-ref/source/directn.cc at line 476 [7.3697945]
∅:D[4.26926] → [73.2837:2872]
B:BD[73.2837] → [73.2837:2872]
```
            || is_altar(grd(*ri)))
```
[4.26926]
[73.2872]
```
            || feat_is_altar(grd(*ri)))
```

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

B:BD[67.7861] → [67.7861:7937]

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

[67.7861]

[67.7937]

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

Replacement in crawl-ref/source/directn.cc at line 3061 [7.3697945]
B:BD[72.4276] → [72.4276:4313]
```
        else if (is_stair(grd(pos)))
```
[72.4276]
[72.4313]
```
        else if (feat_is_stair(grd(pos)))
```
Replacement in crawl-ref/source/debug.cc at line 6912 [7.4016436]
B:BD[74.8585] → [74.8585:8618]
```
    if (is_travelable_stair(ft))
```
[74.8585]
[74.8618]
```
    if (feat_is_travelable_stair(ft))
```

Replacement in crawl-ref/source/abyss.cc at line 791 [7.4482606]

B:BD[75.18059] → [75.18059:18117]

            if (!in_bounds(n) || !is_traversable(grd(n)))

[75.18059]

[75.18117]

            if (!in_bounds(n) || !feat_is_traversable(grd(n)))

Replacement in crawl-ref/source/abyss.cc at line 832 [7.4482606]

B:BD[75.19154] → [76.41754:41810]

    if (is_traversable(grd(c)) && !is_traversable(feat)

[75.19154]

[76.41810]

    if (feat_is_traversable(grd(c)) && !feat_is_traversable(feat)

Replacement in crawl-ref/source/abyss.cc at line 838 [7.4482606]

B:BD[75.19260] → [76.41858:41939]

    if (!is_traversable(grd(c)) && is_traversable(feat) && _is_sealed_square(c))

[75.19260]

[75.19340]

    if (!feat_is_traversable(grd(c)) && feat_is_traversable(feat) && _is_sealed_square(c))

More renaming and reorganization of feature checks.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 401 [7.16817]

Replacement in crawl-ref/source/view.cc at line 1590 [7.16817]

Replacement in crawl-ref/source/view.cc at line 1593 [7.16817]

Replacement in crawl-ref/source/view.cc at line 1598 [7.16817]

Replacement in crawl-ref/source/view.cc at line 1607 [7.16817]

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

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

Deletion in crawl-ref/source/travel.h at line 69 [18.29464]

Deletion in crawl-ref/source/travel.h at line 70 [18.29464]

Deletion in crawl-ref/source/travel.h at line 74 [18.29464]

Insertion in crawl-ref/source/travel.h at line 76 [18.29464]

Deletion in crawl-ref/source/travel.cc at line 217 [18.39949]

Deletion in crawl-ref/source/travel.cc at line 220 [18.39949]

Replacement in crawl-ref/source/travel.cc at line 221 [18.39949]

Replacement in crawl-ref/source/travel.cc at line 226 [18.39949]

Replacement in crawl-ref/source/travel.cc at line 261 [18.39949]

Replacement in crawl-ref/source/travel.cc at line 625 [18.39949]

Deletion in crawl-ref/source/travel.cc at line 780 [18.39949]

Replacement in crawl-ref/source/travel.cc at line 987 [18.39949]

Replacement in crawl-ref/source/travel.cc at line 1888 [18.39949]

Replacement in crawl-ref/source/travel.cc at line 3526 [18.39949]

Replacement in crawl-ref/source/travel.cc at line 3530 [18.39949]

Replacement in crawl-ref/source/travel.cc at line 4157 [18.39949]

Replacement in crawl-ref/source/travel.cc at line 4159 [18.39949]

Replacement in crawl-ref/source/travel.cc at line 4161 [18.39949]

Replacement in crawl-ref/source/travel.cc at line 4164 [18.39949]

Replacement in crawl-ref/source/travel.cc at line 4170 [18.39949]

Replacement in crawl-ref/source/travel.cc at line 4176 [18.39949]

Replacement in crawl-ref/source/tilereg.cc at line 1225 [48.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1353 [48.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1363 [48.54399]

Replacement in crawl-ref/source/tilepick.cc at line 74 [12.96318]

Replacement in crawl-ref/source/tilepick.cc at line 4547 [12.96318]

Insertion in crawl-ref/source/terrain.h at line 21 [52.24828]

Deletion in crawl-ref/source/terrain.h at line 27 [52.24828]

Insertion in crawl-ref/source/terrain.h at line 38 [52.24828]

Insertion in crawl-ref/source/terrain.h at line 52 [52.24828]

Deletion in crawl-ref/source/terrain.cc at line 96 [52.26938]

Insertion in crawl-ref/source/terrain.cc at line 117 [52.26938]

Insertion in crawl-ref/source/terrain.cc at line 180 [52.26938]

Insertion in crawl-ref/source/terrain.cc at line 391 [52.26938]

Replacement in crawl-ref/source/terrain.cc at line 585 [52.26938]

Replacement in crawl-ref/source/stuff.cc at line 1659 [7.224557]

Replacement in crawl-ref/source/overmap.cc at line 775 [7.1070017]

Replacement in crawl-ref/source/monstuff.cc at line 3432 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3496 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3499 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3501 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3503 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3506 [7.1396662]

Replacement in crawl-ref/source/monplace.cc at line 672 [7.1641732]

Replacement in crawl-ref/source/misc.cc at line 1316 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 1779 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 1861 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 1863 [7.1933596]

Replacement in crawl-ref/source/misc.cc at line 2093 [7.1933596]

Insertion in crawl-ref/source/menu.cc at line 24 [18.261322]

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

Replacement in crawl-ref/source/dungeon.h at line 311 [7.3428186]