fiddlerwoaroof/crawl - Change 627CM2ZOKVBMPVPBYGWBWWPT2FBMVRRH2VDGPT6Z5XCVJ5R4YQWQC

Fix 1858979: Monsters being capable to reach through wallsl.

(And some cleanup.)

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

Created by j-p-e-g on May 19, 2008

627CM2ZOKVBMPVPBYGWBWWPT2FBMVRRH2VDGPT6Z5XCVJ5R4YQWQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/travel.cc at line 948 [4.39949]
[3.1791]
[3.1791]
```
            {
```
Insertion in crawl-ref/source/travel.cc at line 951 [4.39949]
[3.1926]
[3.1927]
```
            }
```

Replacement in crawl-ref/source/travel.cc at line 1138 [4.39949]

B:BD[5.1556] → [5.1556:1630]

            || (you.running.x == you.x_pos && you.running.y == you.y_pos)

[5.1556]

[5.1630]

            || you.running.x == you.x_pos && you.running.y == you.y_pos

Replacement in crawl-ref/source/travel.cc at line 1493 [4.39949]

B:BD[4.69438] → [6.13743:13821]

    refdist = Options.explore_item_greed > 0? &unexplored_dist: &greedy_dist;

[4.69438]

[7.994]

    refdist = (Options.explore_item_greed > 0) ? &unexplored_dist
                                               : &greedy_dist;

Replacement in crawl-ref/source/travel.cc at line 1500 [4.39949]

∅:D[8.700] → [6.14030:14107]

B:BD[6.14030] → [6.14030:14107]

        && !is_trap(start.x, start.y))              // The player likes pain

[8.700]

[4.69598]

        && !is_trap(start.x, start.y))          // player likes pain

Replacement in crawl-ref/source/travel.cc at line 1538 [4.39949]

B:BD[4.72424] → [6.14524:14587]

B:BD[6.14587] → [7.998:1043]

                return (runmode == RMODE_TRAVEL? travel_move()
                        : explore_target());

[4.72424]

[4.72622]

                return (runmode == RMODE_TRAVEL ? travel_move()
                                                : explore_target());

Insertion in crawl-ref/source/travel.cc at line 1579 [4.39949]
[6.15975]
[9.4289]
```
            {
```
Insertion in crawl-ref/source/travel.cc at line 1581 [4.39949]
[9.4335]
[5.3161]
```
            }
```

Replacement in crawl-ref/source/travel.cc at line 1587 [4.39949]

B:BD[4.73570] → [6.16073:16122]

B:BD[6.16122] → [7.1080:1113]

    return (rmode == RMODE_TRAVEL? travel_move()
            : explore_target());

[4.73570]

[6.16156]

    return (rmode == RMODE_TRAVEL ? travel_move()
                                  : explore_target());

Replacement in crawl-ref/source/monstuff.cc at line 3274 [10.1396662]

B:BD[10.1478280] → [10.1478280:1478346]

        if ((monster->type != MONS_HELL_HOUND && random2(13) < 3)

[10.1478280]

[10.1478346]

        if (monster->type != MONS_HELL_HOUND && random2(13) < 3

Replacement in crawl-ref/source/monstuff.cc at line 3549 [10.1396662]

B:BD[10.1482022] → [10.1482022:1482088]

                if ((dx == 2 && dy <= 2) || (dy == 2 && dx <= 2))

[10.1482022]

[10.1482088]

                if (dx == 2 && dy <= 2 || dy == 2 && dx <= 2)

Insertion in crawl-ref/source/monstuff.cc at line 3558 [10.1396662]

[10.1482294]

            int foe_x = menv[monster->foe].x;
            int foe_y = menv[monster->foe].y;

Replacement in crawl-ref/source/monstuff.cc at line 3561 [10.1396662]

B:BD[10.1482352] → [10.1482352:1482472]

            if (monster->target_x == menv[monster->foe].x
                && monster->target_y == menv[monster->foe].y)

[10.1482352]

[10.1482472]

            if (monster->target_x == foe_x && monster->target_y == foe_y
                && monster->mon_see_grid(foe_x, foe_y, true))

Replacement in crawl-ref/source/monstuff.cc at line 3564 [10.1396662]

B:BD[10.1482486] → [10.1482486:1482682]

                int dx = abs(monster->x - menv[monster->foe].x);
                int dy = abs(monster->y - menv[monster->foe].y);
                if ((dx == 2 && dy <= 2) || (dy == 2 && dx <= 2))

[10.1482486]

[10.1482682]

                int dx = abs(monster->x - foe_x);
                int dy = abs(monster->y - foe_y);
                if (dx == 2 && dy <= 2 || dy == 2 && dx <= 2)

Insertion in crawl-ref/source/monstuff.cc at line 4870 [10.1396662]
[11.2027]
[11.2027]
```
        {
```
Insertion in crawl-ref/source/monstuff.cc at line 4873 [10.1396662]
[12.7808]
[11.2123]
```
        }
```

Replacement in crawl-ref/source/monstuff.cc at line 4906 [10.1396662]

B:BD[13.5632] → [14.3587:3638]

                    || monster->x + mmov_x >= GXM)

[13.5632]

[13.5688]

                     || monster->x + mmov_x >= GXM)

Replacement in crawl-ref/source/monstuff.cc at line 4912 [10.1396662]

B:BD[13.5805] → [13.5805:5861]

                         || monster->y + mmov_y >= GYM)

[13.5805]

[13.5861]

                     || monster->y + mmov_y >= GYM)

Replacement in crawl-ref/source/mon-util.cc at line 5617 [10.1699344]
B:BD[15.1101] → [2.10307:10357]
```
bool monsters::mon_see_grid(int tx, int ty) const
```
[15.1101]
[2.10357]
```
bool monsters::mon_see_grid(int tx, int ty, bool reach) const
```
Replacement in crawl-ref/source/mon-util.cc at line 5620 [10.1699344]
B:BD[2.10417] → [2.10417:10439]
```
        return false;
```
[2.10417]
[2.10439]
```
        return (false);
```

Replacement in crawl-ref/source/mon-util.cc at line 5622 [10.1699344]

B:BD[2.10440] → [2.10440:10552]

    // Ignoring clouds for now.
    return (num_feats_between(x, y, tx, ty, DNGN_UNSEEN, DNGN_MAXOPAQUE) == 0);

[2.10440]

[2.10552]

    dungeon_feature_type max_disallowed = DNGN_MAXOPAQUE;
    if (reach)
        max_disallowed = DNGN_MAX_NONREACH;
    // XXX: Ignoring clouds for now.
    return (num_feats_between(x, y, tx, ty, DNGN_UNSEEN, max_disallowed) == 0);

Replacement in crawl-ref/source/externs.h at line 1212 [10.3270163]
B:BD[2.11006] → [2.11006:11051]
```
    bool mon_see_grid(int tx, int ty) const;
```
[2.11006]
[16.4614]
```
    bool mon_see_grid(int tx, int ty, bool reach = false) const;
```
Deletion in crawl-ref/source/enum.h at line 863 [10.3287960]
B:BD[15.2800] → [15.2800:2862]
```
    DNGN_ORCISH_IDOL,                  //   12 - Can see past
```
Replacement in crawl-ref/source/enum.h at line 864 [10.3287960]
B:BD[15.2863] → [15.2863:2917]
```
    // XXX: lowest/highest grid value which is a wall
```
[15.2863]
[17.3894]
```
    // lowest/highest grid value which is a wall
```
Replacement in crawl-ref/source/enum.h at line 872 [10.3287960]
∅:D[17.4049] → [15.2999:3046]
B:BD[15.2999] → [15.2999:3046]
```
    // XXX: highest grid value which is opaque
```
[17.4049]
[15.3046]
```
    // highest grid value which is opaque
```
Replacement in crawl-ref/source/enum.h at line 875 [10.3287960]
B:BD[10.3307969] → [18.2851:2907]
```
    // XXX: lowest grid value which can be seen through
```
[10.3307969]
[15.3089]
```
    // lowest grid value which can be seen through
```

Insertion in crawl-ref/source/enum.h at line 878 [10.3287960]

[18.2930]

    // highest grid value which can't be reached through
    DNGN_MAX_NONREACH = DNGN_CLEAR_PERMAROCK_WALL,
    // Can be seen through and reached past.
    DNGN_ORCISH_IDOL = 12,

Replacement in crawl-ref/source/enum.h at line 884 [10.3287960]
∅:D[18.2977] → [19.911518:911546]
B:BD[10.3308182] → [19.911518:911546]
B:BD[19.911546] → [18.2978:3006]
```
    DNGN_STATUE_RESERVED_1,
    DNGN_STATUE_RESERVED_2,
```
[18.2977]
[18.3006]
```
    DNGN_STATUE_RESERVED,
```

Replacement in crawl-ref/source/enum.h at line 886 [10.3287960]

B:BD[18.3007] → [18.3007:3073]

    // XXX: lowest grid value which can be passed by walking etc.

[18.3007]

[18.3073]

    // lowest grid value which can be passed by walking etc.

Fix 1858979: Monsters being capable to reach through wallsl.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/travel.cc at line 948 [4.39949]

Insertion in crawl-ref/source/travel.cc at line 951 [4.39949]

Replacement in crawl-ref/source/travel.cc at line 1138 [4.39949]

Replacement in crawl-ref/source/travel.cc at line 1493 [4.39949]

Replacement in crawl-ref/source/travel.cc at line 1500 [4.39949]

Replacement in crawl-ref/source/travel.cc at line 1538 [4.39949]

Insertion in crawl-ref/source/travel.cc at line 1579 [4.39949]

Insertion in crawl-ref/source/travel.cc at line 1581 [4.39949]

Replacement in crawl-ref/source/travel.cc at line 1587 [4.39949]

Replacement in crawl-ref/source/monstuff.cc at line 3274 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3549 [10.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 3558 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3561 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3564 [10.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 4870 [10.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 4873 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4906 [10.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4912 [10.1396662]

Replacement in crawl-ref/source/mon-util.cc at line 5617 [10.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5620 [10.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5622 [10.1699344]

Replacement in crawl-ref/source/externs.h at line 1212 [10.3270163]

Deletion in crawl-ref/source/enum.h at line 863 [10.3287960]

Replacement in crawl-ref/source/enum.h at line 864 [10.3287960]

Replacement in crawl-ref/source/enum.h at line 872 [10.3287960]

Replacement in crawl-ref/source/enum.h at line 875 [10.3287960]

Insertion in crawl-ref/source/enum.h at line 878 [10.3287960]

Replacement in crawl-ref/source/enum.h at line 884 [10.3287960]

Replacement in crawl-ref/source/enum.h at line 886 [10.3287960]