fiddlerwoaroof/crawl - Change SELQ6AD2GNYLGHJVONUUFDHSCMGYMMNQF5D72D7KTAYOV36T2BBAC

Actually use the new rock habitat properly (oops).

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

Created by dolorous on January 4, 2008

SELQ6AD2GNYLGHJVONUUFDHSCMGYMMNQF5D72D7KTAYOV36T2BBAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/terrain.h at line 34 [4.24828]
[3.256]
[4.25710]
```
bool grid_is_permarock(dungeon_feature_type grid);
```
Replacement in crawl-ref/source/terrain.cc at line 179 [4.26938]
B:BD[4.31317] → [3.258:305]
```
bool grid_is_rock( dungeon_feature_type grid )
```
[4.31317]
[3.305]
```
bool grid_is_rock(dungeon_feature_type grid)
```

Insertion in crawl-ref/source/terrain.cc at line 188 [4.26938]

[3.525]

[4.31317]

bool grid_is_permarock(dungeon_feature_type grid)
{
    return (grid == DNGN_PERMAROCK_WALL || grid == DNGN_CLEAR_PERMAROCK_WALL);
}

Replacement in crawl-ref/source/mon-util.h at line 156 [6.1682293]
B:BD[5.2885] → [5.2885:2931]
```
    HT_ROCK_WALL,       // Rock wall critters
```
[5.2885]
[5.2931]
```
    HT_ROCK,            // Rock critters
```

Insertion in crawl-ref/source/mon-util.cc at line 94 [6.1699344]

[7.805]

[8.466503]

    if (grid_is_rock(grid) && !grid_is_permarock(grid))
        return (HT_ROCK);

Deletion in crawl-ref/source/mon-util.cc at line 101 [6.1699344]
B:BD[8.466695] → [5.3136:3192]
```
    case DNGN_ROCK_WALL:
        return (HT_ROCK_WALL);
```
Replacement in crawl-ref/source/mon-util.cc at line 115 [6.1699344]
B:BD[8.466971] → [5.3214:3237]
```
    case HT_ROCK_WALL:
```
[8.466971]
[5.3237]
```
    case HT_ROCK:
```

Replacement in crawl-ref/source/mon-util.cc at line 2439 [6.1699344]

B:BD[9.1812] → [9.1812:1977]

    // Permanent walls can't be passed through.
    if (grid == DNGN_CLEAR_PERMAROCK_WALL || grid == DNGN_PERMAROCK_WALL)
        return false;
    switch (mclass)

[9.1812]

[9.1977]

    if (mons_habitat(mclass) == HT_ROCK)

Replacement in crawl-ref/source/mon-util.cc at line 2441 [6.1699344]

B:BD[9.1983] → [9.1983:2008]

B:BD[9.2008] → [3.1871:1932]

    case MONS_ROCK_WORM:
        return (!grid_is_solid(grid) || grid_is_rock(grid));

[9.1983]

[9.2086]

        // Permanent walls can't be passed through.
        return (!grid_is_solid(grid) ||
                   (grid_is_rock(grid) && !grid_is_permarock(grid)));

Replacement in crawl-ref/source/mon-data.h at line 3941 [6.1826214]

B:BD[9.2879] → [7.22621:22681]

    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE

[9.2879]

[9.2930]

    HT_ROCK, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE

Replacement in crawl-ref/source/debug.cc at line 1414 [6.4016436]

B:BD[5.28205] → [5.28205:28267]

          (hab == HT_ROCK_WALL)               ? "rock wall" :

[5.28205]

[2.397]

          (hab == HT_ROCK)                    ? "rock" :

Actually use the new rock habitat properly (oops).

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/terrain.h at line 34 [4.24828]

Replacement in crawl-ref/source/terrain.cc at line 179 [4.26938]

Insertion in crawl-ref/source/terrain.cc at line 188 [4.26938]

Replacement in crawl-ref/source/mon-util.h at line 156 [6.1682293]

Insertion in crawl-ref/source/mon-util.cc at line 94 [6.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 101 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 115 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2439 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2441 [6.1699344]

Replacement in crawl-ref/source/mon-data.h at line 3941 [6.1826214]

Replacement in crawl-ref/source/debug.cc at line 1414 [6.4016436]