fiddlerwoaroof/crawl - Change 247OW5JFN34ZV3GRVHRE25AXLLISUBPOX5YRGUE64BCM2V7QNEHAC

[1861488] Fixed passwall bugs.

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

Created by dshaligram on January 25, 2008

247OW5JFN34ZV3GRVHRE25AXLLISUBPOX5YRGUE64BCM2V7QNEHAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells4.cc at line 1405 [4.436250]
B:BD[4.480716] → [4.480716:480749]
```
    char dx, dy, nx = x, ny = y;
```
[4.480716]
[4.480749]
```
    int dx, dy, nx = x, ny = y;
```
Insertion in crawl-ref/source/spells4.cc at line 1409 [4.436250]
[4.480849]
[4.480849]
```
    bool non_rock_barriers = false;
```

Replacement in crawl-ref/source/spells4.cc at line 1427 [4.436250]

B:BD[4.481334] → [4.481334:481491]

        // I'm trying to figure proper borders out {dlb}
        // FIXME: dungeon border?
        if (nx > (GXM - 1) || ny > (GYM - 1) || nx < 2 || ny < 2)

[4.481334]

[4.481491]

        if (!in_bounds(nx, ny))

Insertion in crawl-ref/source/spells4.cc at line 1436 [4.436250]

[4.481652]

            if (grid_is_solid(grd[nx][ny]))
                non_rock_barriers = true;

Insertion in crawl-ref/source/spells4.cc at line 1440 [4.436250]
[4.481696]
[4.481696]
```
            
```
Replacement in crawl-ref/source/spells4.cc at line 1455 [4.436250]
B:BD[4.481970] → [4.481970:481997]
```
    if (howdeep > shallow)
```
[4.481970]
[4.481997]
```
    if (howdeep > shallow || non_rock_barriers)
```

Replacement in crawl-ref/source/spells4.cc at line 1457 [4.436250]

B:BD[4.482003] → [4.482003:482041]

        mpr("This rock feels deep.");

[4.482003]

[4.482041]

        mprf("This rock feels %sdeep.",
             non_rock_barriers || (howdeep > range)? "extremely " : "");

Replacement in crawl-ref/source/spells4.cc at line 1462 [4.436250]
B:BD[4.482086] → [4.482086:482119]
```
            if (howdeep > range)
```
[4.482086]
[4.482119]
```
            if (howdeep > range || non_rock_barriers)
```

Replacement in crawl-ref/source/spells2.cc at line 174 [4.569242]

B:BD[5.197] → [5.197:252]

                && mon->can_pass_through(grd[gx][gy]))

[5.197]

[6.150045]

                && mon->can_pass_through_feat(grd[gx][gy]))

Replacement in crawl-ref/source/player.cc at line 119 [4.962854]
B:BD[6.337966] → [5.272:320]
```
    ASSERT( you.can_pass_through( new_grid ) );
```
[6.337966]
[6.338008]
```
    ASSERT( you.can_pass_through_feat( new_grid ) );
```

Insertion in crawl-ref/source/player.cc at line 5176 [4.962854]

[2.1224]

[7.200948]

}
bool actor::can_pass_through(int x, int y) const
{
    return can_pass_through_feat(grd[x][y]);
}
bool actor::can_pass_through(const coord_def &c) const
{
    return can_pass_through_feat(grd(c));

Replacement in crawl-ref/source/player.cc at line 5468 [4.962854]

B:BD[8.3245] → [5.321:390]

bool player::can_pass_through(const dungeon_feature_type grid) const

[8.3245]

[5.390]

bool player::can_pass_through_feat(dungeon_feature_type grid) const

Deletion in crawl-ref/source/player.cc at line 5471 [4.962854]

B:BD[5.425] → [5.425:634]

}
bool player::can_pass_through(const int _x, const int _y) const
{
    return can_pass_through(grd[_x][_y]);
}
bool player::can_pass_through(const coord_def &c) const
{
    return can_pass_through(grd(c));

Deletion in crawl-ref/source/ouch.cc at line 772 [4.1104358]

B:BD[4.1118756] → [4.1118756:1118831]

B:BD[4.1118831] → [9.14751:14846]

∅:D[9.14846] → [4.1118975:1119008]

B:BD[4.1118975] → [4.1118975:1119008]

    }
    // assumed bug for high damage amounts
    if (dam > 300)
    {
        mprf(MSGCH_DANGER,
             "Potential bug: Unexpectedly high damage = %d", dam );
        return;

Replacement in crawl-ref/source/monstuff.cc at line 5291 [4.1396662]

B:BD[3.4436] → [3.4436:4489]

    else if (!monster->can_pass_through(target_grid)

[3.4436]

[3.4489]

    else if (!monster->can_pass_through_feat(target_grid)

Replacement in crawl-ref/source/mon-util.cc at line 2453 [4.1699344]

B:BD[5.2129] → [5.2129:2200]

bool monsters::can_pass_through(const dungeon_feature_type grid) const

[5.2129]

[5.2200]

bool monsters::can_pass_through_feat(dungeon_feature_type grid) const

Deletion in crawl-ref/source/mon-util.cc at line 2456 [4.1699344]

∅:D[5.2246] → [8.8489:8492]

B:BD[8.8489] → [8.8489:8492]

B:BD[8.8492] → [5.2247:2457]

}
bool monsters::can_pass_through(const int _x, const int _y) const
{
    return can_pass_through(grd[_x][_y]);
}
bool monsters::can_pass_through(const coord_def &c) const
{
    return can_pass_through(grd(c));

Replacement in crawl-ref/source/externs.h at line 98 [4.3270163]

B:BD[5.3202] → [5.3202:3416]

    virtual bool can_pass_through(const dungeon_feature_type grid) const = 0;
    virtual bool can_pass_through(const int x, const int y) const = 0;
    virtual bool can_pass_through(const coord_def &c) const = 0;

[5.3202]

[8.81471]

    virtual bool can_pass_through_feat(dungeon_feature_type grid) const = 0;
    virtual bool can_pass_through(int x, int y) const;
    virtual bool can_pass_through(const coord_def &c) const;

Replacement in crawl-ref/source/externs.h at line 810 [4.3270163]

B:BD[8.82914] → [5.3417:3610]

    bool      can_pass_through(const dungeon_feature_type grid) const;
    bool      can_pass_through(const int x, const int y) const;
    bool      can_pass_through(const coord_def &c) const;

[8.82914]

    bool      can_pass_through_feat(dungeon_feature_type grid) const;

Replacement in crawl-ref/source/externs.h at line 1097 [4.3270163]

B:BD[8.83725] → [5.3611:3804]

    bool      can_pass_through(const dungeon_feature_type grid) const;
    bool      can_pass_through(const int x, const int y) const;
    bool      can_pass_through(const coord_def &c) const;

[8.83725]

    bool      can_pass_through_feat(dungeon_feature_type grid) const;

Replacement in crawl-ref/source/delay.cc at line 780 [4.3963459]

B:BD[10.6101] → [10.6101:6168]

B:BD[10.6168] → [11.13663:13742]

∅:D[11.13742] → [10.6168:6276]

B:BD[10.6168] → [10.6168:6276]

B:BD[10.6358] → [10.6358:6420]

            case DNGN_ROCK_WALL:
            case DNGN_STONE_WALL:
            case DNGN_CLEAR_ROCK_WALL:
            case DNGN_CLEAR_STONE_WALL:
            case DNGN_METAL_WALL:
            case DNGN_GREEN_CRYSTAL_WALL:
            case DNGN_WAX_WALL:
                ouch(1 + you.hp, 0, KILLED_BY_PETRIFICATION);

[10.6101]

[10.6420]

            default:
                if (!you.can_pass_through_feat(grd[pass_x][pass_y]))
                    ouch(1 + you.hp, 0, KILLED_BY_PETRIFICATION);

Deletion in crawl-ref/source/delay.cc at line 789 [4.3963459]
∅:D[10.6641] → [6.1004688:1004689]
B:BD[4.3971641] → [6.1004688:1004689]
B:BD[6.1004689] → [10.6642:6686]
```
            default:
                break;
```