fiddlerwoaroof/crawl - Change VSXFXNKXKVVHNDE3IRQQLT5NZJNVYFZI5634RO6GZE35UFFKHIPAC

Simplify checks for grids containing water.

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

Created by dolorous on January 25, 2009

VSXFXNKXKVVHNDE3IRQQLT5NZJNVYFZI5634RO6GZE35UFFKHIPAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 1265 [7.3]

B:BD[4.1141] → [4.1141:1206]

    if (in_view[DNGN_DEEP_WATER] || in_view[DNGN_SHALLOW_WATER])

[4.1141]

[4.1206]

    if (in_view[DNGN_SHALLOW_WATER] || in_view[DNGN_DEEP_WATER])

Replacement in crawl-ref/source/xom.cc at line 1345 [7.3]

B:BD[4.3662] → [4.3662:3733]

            if (feat == DNGN_DEEP_WATER || feat == DNGN_SHALLOW_WATER)

[4.3662]

[4.3733]

            if (grid_is_water(feat))

Replacement in crawl-ref/source/xom.cc at line 1349 [7.3]

B:BD[4.3877] → [4.3877:3949]

        else if (feat == DNGN_DEEP_WATER || feat == DNGN_SHALLOW_WATER)

[4.3877]

[4.3949]

        else if (grid_is_water(feat))

Replacement in crawl-ref/source/travel.cc at line 539 [10.39949]

B:BD[8.619] → [9.280:346]

B:BD[9.346] → [11.1494:1575]

    return (grid == DNGN_DEEP_WATER || grid == DNGN_SHALLOW_WATER
            || grid == DNGN_LAVA || is_trap(x, y) || _is_monster_blocked(x, y));

[8.619]

[10.49708]

    return (grid_is_water(grid)
               || grid == DNGN_LAVA
               || is_trap(x, y)
               || _is_monster_blocked(x, y));

Replacement in crawl-ref/source/travel.cc at line 707 [10.39949]
B:BD[10.59349] → [10.59349:59381]
```
        return DNGN_DEEP_WATER;
```
[10.59349]
[10.59381]
```
        return (DNGN_DEEP_WATER);
```
Replacement in crawl-ref/source/travel.cc at line 709 [10.39949]
B:BD[10.59441] → [10.59441:59476]
```
        return DNGN_SHALLOW_WATER;
```
[10.59441]
[10.59476]
```
        return (DNGN_SHALLOW_WATER);
```

Replacement in crawl-ref/source/travel.cc at line 1799 [10.39949]

B:BD[12.412] → [12.412:521]

                       && feature != DNGN_SHALLOW_WATER
                       && feature != DNGN_DEEP_WATER

[12.412]

[12.521]

                       && grid_is_water(feature)

Replacement in crawl-ref/source/tilepick.cc at line 121 [15.96318]
∅:D[13.14970] → [14.217:294]
B:BD[14.217] → [14.217:294]
```
    bool in_water = (grid == DNGN_SHALLOW_WATER || grid == DNGN_DEEP_WATER);
```
[13.14970]
[16.3355]
```
    bool in_water = grid_is_water(grid);
```

Replacement in crawl-ref/source/terrain.h at line 46 [17.24828]

B:BD[17.26195] → [17.26195:26358]

god_type grid_altar_god( dungeon_feature_type grid );
dungeon_feature_type altar_for_god( god_type god );
bool grid_is_branch_stairs( dungeon_feature_type grid );

[17.26195]

[18.143]

god_type grid_altar_god(dungeon_feature_type grid);
dungeon_feature_type altar_for_god(god_type god);
bool grid_is_branch_stairs(dungeon_feature_type grid);

Replacement in crawl-ref/source/terrain.h at line 50 [17.24828]

∅:D[18.211] → [19.270:328]

B:BD[19.270] → [19.270:328]

                               std::set<coord_def>& out);

[18.211]

[20.143]

                              std::set<coord_def>& out);

Replacement in crawl-ref/source/terrain.cc at line 168 [17.26938]
B:BD[17.30956] → [17.30956:31005]
```
bool grid_is_opaque( dungeon_feature_type grid )
```
[17.30956]
[17.31005]
```
bool grid_is_opaque(dungeon_feature_type grid)
```
Replacement in crawl-ref/source/terrain.cc at line 173 [17.26938]
B:BD[17.31071] → [17.31071:31119]
```
bool grid_is_solid( dungeon_feature_type grid )
```
[17.31071]
[17.31119]
```
bool grid_is_solid(dungeon_feature_type grid)
```
Replacement in crawl-ref/source/terrain.cc at line 178 [17.26938]
B:BD[17.31158] → [17.31158:31193]
```
bool grid_is_solid( int x, int y )
```
[17.31158]
[17.31193]
```
bool grid_is_solid(int x, int y)
```
Replacement in crawl-ref/source/terrain.cc at line 214 [17.26938]
B:BD[17.31599] → [17.31599:31648]
```
bool grid_is_watery( dungeon_feature_type grid )
```
[17.31599]
[17.31648]
```
bool grid_is_watery(dungeon_feature_type grid)
```
Replacement in crawl-ref/source/terrain.cc at line 219 [17.26938]
B:BD[17.31717] → [17.31717:31771]
```
bool grid_destroys_items( dungeon_feature_type grid )
```
[17.31717]
[17.31771]
```
bool grid_destroys_items(dungeon_feature_type grid)
```

Replacement in crawl-ref/source/terrain.cc at line 224 [17.26938]

B:BD[17.31835] → [11.13469:13539]

∅:D[11.13539] → [17.31904:31957]

B:BD[17.31904] → [17.31904:31957]

// Returns 0 if grid is not an altar, else it returns the GOD_* type.
god_type grid_altar_god( dungeon_feature_type grid )

[17.31835]

[17.31957]

// Returns GOD_NO_GOD if grid is not an altar, otherwise returns the
// GOD_* type.
god_type grid_altar_god(dungeon_feature_type grid)

Replacement in crawl-ref/source/terrain.cc at line 229 [17.26938]

B:BD[21.1564] → [21.1564:1639]

        return (static_cast<god_type>( grid - DNGN_ALTAR_FIRST_GOD + 1 ));

[21.1564]

[17.32088]

        return (static_cast<god_type>(grid - DNGN_ALTAR_FIRST_GOD + 1));

Replacement in crawl-ref/source/terrain.cc at line 234 [17.26938]

B:BD[17.32117] → [11.13540:13617]

∅:D[11.13617] → [17.32197:32248]

B:BD[17.32197] → [17.32197:32248]

// Returns DNGN_FLOOR for non-gods, otherwise returns the altar for the god.
dungeon_feature_type altar_for_god( god_type god )

[17.32117]

[17.32248]

// Returns DNGN_FLOOR for non-gods, otherwise returns the altar for the
// god.
dungeon_feature_type altar_for_god(god_type god)

Replacement in crawl-ref/source/terrain.cc at line 1063 [17.26938]

B:BD[3.7430] → [3.7430:7507]

        else if (!airborne && grid >= DNGN_LAVA && grid <= DNGN_WATER_STUCK)

[3.7430]

[3.7507]

        else if (!airborne && grid_can_be_drowned_in(grid))

Replacement in crawl-ref/source/spells2.cc at line 1403 [23.569242]

B:BD[22.3048] → [13.33665:33811]

    else if ((grd(targ) == DNGN_DEEP_WATER
                || grd(targ) == DNGN_SHALLOW_WATER
                || grd(targ) == DNGN_FOUNTAIN_BLUE)

[22.3048]

[22.3224]

    else if (grid_is_watery(grd(targ))

Replacement in crawl-ref/source/player.cc at line 378 [23.962854]

B:BD[24.375] → [25.323:397]

                || (grid == DNGN_DEEP_WATER && !player_likes_water()) ));

[24.375]

[24.443]

                || (grid == DNGN_DEEP_WATER && !player_likes_water())));

Deletion in crawl-ref/source/player.cc at line 2674 [23.962854]

B:BD[23.1003737] → [26.2663:2779]

    // Treat monsters who are submerged due to drowning as visible, so
    // we get proper messages when they die.

Replacement in crawl-ref/source/player.cc at line 2679 [23.962854]

B:BD[26.2857] → [6.2726:2976]

    // Monsters can only drown in lava or water, so monsters that are
    // "submerged" in other features (air elementals in air, trapdoor
    // spiders in the floor) are exempt from this check.
    if (feat < DNGN_LAVA || feat > DNGN_WATER_STUCK)

[26.2857]

[6.2976]

    // Treat monsters who are submerged due to drowning as visible, so
    // we get proper messages when they die.  Monsters can only drown in
    // lava or deep water, so monsters that are "submerged" in other
    // features (air elementals in air, trapdoor spiders in the floor)
    // are exempt from this check.
    if (feat != DNGN_LAVA && feat != DNGN_DEEP_WATER)

Replacement in crawl-ref/source/player.cc at line 2686 [23.962854]
B:BD[6.3000] → [6.3000:3009]
```
        
```
[6.3000]
[6.3009]

Replacement in crawl-ref/source/monstuff.cc at line 7968 [23.1396662]

B:BD[27.2671] → [28.4432:4507]

    // Non-friendly and non-good neutral monsters won't enter sanctuaries.

[27.2671]

[27.2721]

    // Non-friendly and non-good neutral monsters won't enter
    // sanctuaries.

Insertion in crawl-ref/source/monstuff.cc at line 7976 [23.1396662]
[29.14592]
[28.4508]

Replacement in crawl-ref/source/monstuff.cc at line 8012 [23.1396662]

B:BD[30.3413] → [31.6294:6405]

             || no_water && target_grid >= DNGN_DEEP_WATER
                && target_grid <= DNGN_WATER_STUCK)

[30.3413]

[32.4603]

             || no_water && grid_is_water(target_grid))

Replacement in crawl-ref/source/monstuff.cc at line 8016 [23.1396662]
B:BD[32.4637] → [33.10231:10284]
```
    else if (!_habitat_okay( monster, target_grid ))
```
[32.4637]
[32.4689]
```
    else if (!_habitat_okay(monster, target_grid))
```
Replacement in crawl-ref/source/monstuff.cc at line 8042 [23.1396662]
B:BD[32.5100] → [32.5100:5144]
```
    // Fire elementals avoid water and cold
```
[32.5100]
[32.5144]
```
    // Fire elementals avoid water and cold.
```

Deletion in crawl-ref/source/monplace.cc at line 80 [23.1641732]

B:BD[34.451194] → [34.451194:451334]

    // XXX What in Xom's name is DNGN_WATER_STUCK? It looks like an artificial
    // device to slow down fiery monsters flying over water.

Replacement in crawl-ref/source/monplace.cc at line 765 [23.1641732]

B:BD[35.6191] → [2.2473:2545]

                && (mons_speed(mg.cls) == 0 || grd(mg.pos) == DNGN_LAVA

[35.6191]

[36.25948]

                && (mons_speed(mg.cls) == 0
                    || grd(mg.pos) == DNGN_LAVA

Replacement in crawl-ref/source/mon-util.cc at line 8356 [23.1699344]

B:BD[37.20033] → [37.20033:20105]

        else if (feat == DNGN_DEEP_WATER || feat == DNGN_SHALLOW_WATER)

[37.20033]

[37.20105]

        else if (grid_is_water(feat))

Replacement in crawl-ref/source/dungeon.cc at line 1852 [23.3429798]

∅:D[38.12252] → [39.7151:7291]

B:BD[40.1074] → [39.7151:7291]

        {
            taken[i][j] = (grd[i][j] == DNGN_DEEP_WATER
                           || grd[i][j] == DNGN_SHALLOW_WATER);
        }

[38.12252]

[40.1194]

            taken[i][j] = grid_is_water(grd[i][j]);

Replacement in crawl-ref/source/dungeon.cc at line 2022 [23.3429798]

B:BD[41.769] → [42.3074:3132]

    for ( int iteration = 0; iteration < 6; ++iteration )

[41.769]

[41.803]

    for (int iteration = 0; iteration < 6; ++iteration)

Replacement in crawl-ref/source/dungeon.cc at line 2024 [23.3429798]

B:BD[41.809] → [41.809:863]

B:BD[41.873] → [41.873:931]

B:BD[41.945] → [41.945:997]

        for ( int x = margin; x < GXM - margin; ++x )
            for ( int y = margin; y < GYM - margin; ++y )
                if ( grd[x][y] == DNGN_DEEP_WATER )

[41.809]

[41.997]

        for (int x = margin; x < GXM - margin; ++x)
            for (int y = margin; y < GYM - margin; ++y)
                if (grd[x][y] == DNGN_DEEP_WATER)

Replacement in crawl-ref/source/dungeon.cc at line 3419 [23.3429798]
∅:D[38.13416] → [39.10899:10980]
B:BD[23.3579724] → [39.10899:10980]
```
            if (grd[x][y] == DNGN_DEEP_WATER || grd[x][y] == DNGN_SHALLOW_WATER)
```
[38.13416]
[23.3579859]
```
            if (grid_is_water(grd[x][y]))
```
Insertion in crawl-ref/source/directn.cc at line 2262 [23.3697945]
[43.5314]
[43.5314]
Replacement in crawl-ref/source/directn.cc at line 2285 [23.3697945]
∅:D[5.9692] → [44.9472:9568]
B:BD[38.19112] → [44.9472:9568]
∅:D[45.7825] → [25.1638:1677]
∅:D[44.9568] → [25.1638:1677]
B:BD[25.1638] → [25.1638:1677]
```
    if ((grd(you.pos()) == DNGN_DEEP_WATER
            || grd(you.pos()) == DNGN_SHALLOW_WATER)
        && player_likes_water())
    {
```
[5.9692]
[25.1677]
```
    if (grid_is_water(grid) && player_likes_water())
```
Replacement in crawl-ref/source/directn.cc at line 2287 [23.3697945]
B:BD[25.1717] → [25.1717:1723]
```
    }
```
[25.1717]
[25.1723]

Replacement in crawl-ref/source/directn.cc at line 3248 [23.3697945]

B:BD[46.1276] → [46.1276:1358]

            || feat == DNGN_SHALLOW_WATER
            || feat == DNGN_DEEP_WATER)

[46.1276]

[25.1910]

            || grid_is_water(feat))

Insertion in crawl-ref/source/directn.cc at line 3252 [23.3697945]
[25.1931]
[47.1900]

Simplify checks for grids containing water.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.cc at line 1265 [7.3]

Replacement in crawl-ref/source/xom.cc at line 1345 [7.3]

Replacement in crawl-ref/source/xom.cc at line 1349 [7.3]

Replacement in crawl-ref/source/travel.cc at line 539 [10.39949]

Replacement in crawl-ref/source/travel.cc at line 707 [10.39949]

Replacement in crawl-ref/source/travel.cc at line 709 [10.39949]

Replacement in crawl-ref/source/travel.cc at line 1799 [10.39949]

Replacement in crawl-ref/source/tilepick.cc at line 121 [15.96318]

Replacement in crawl-ref/source/terrain.h at line 46 [17.24828]

Replacement in crawl-ref/source/terrain.h at line 50 [17.24828]

Replacement in crawl-ref/source/terrain.cc at line 168 [17.26938]

Replacement in crawl-ref/source/terrain.cc at line 173 [17.26938]

Replacement in crawl-ref/source/terrain.cc at line 178 [17.26938]

Replacement in crawl-ref/source/terrain.cc at line 214 [17.26938]

Replacement in crawl-ref/source/terrain.cc at line 219 [17.26938]

Replacement in crawl-ref/source/terrain.cc at line 224 [17.26938]

Replacement in crawl-ref/source/terrain.cc at line 229 [17.26938]

Replacement in crawl-ref/source/terrain.cc at line 234 [17.26938]

Replacement in crawl-ref/source/terrain.cc at line 1063 [17.26938]

Replacement in crawl-ref/source/spells2.cc at line 1403 [23.569242]

Replacement in crawl-ref/source/player.cc at line 378 [23.962854]

Deletion in crawl-ref/source/player.cc at line 2674 [23.962854]

Replacement in crawl-ref/source/player.cc at line 2679 [23.962854]

Replacement in crawl-ref/source/player.cc at line 2686 [23.962854]

Replacement in crawl-ref/source/monstuff.cc at line 7968 [23.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 7976 [23.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8012 [23.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8016 [23.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8042 [23.1396662]

Deletion in crawl-ref/source/monplace.cc at line 80 [23.1641732]

Replacement in crawl-ref/source/monplace.cc at line 765 [23.1641732]

Replacement in crawl-ref/source/mon-util.cc at line 8356 [23.1699344]

Replacement in crawl-ref/source/dungeon.cc at line 1852 [23.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2022 [23.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2024 [23.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3419 [23.3429798]

Insertion in crawl-ref/source/directn.cc at line 2262 [23.3697945]

Replacement in crawl-ref/source/directn.cc at line 2285 [23.3697945]

Replacement in crawl-ref/source/directn.cc at line 2287 [23.3697945]

Replacement in crawl-ref/source/directn.cc at line 3248 [23.3697945]

Insertion in crawl-ref/source/directn.cc at line 3252 [23.3697945]