fiddlerwoaroof/crawl - Change FBVU7IUFVPEVV5ON6PWJWJ7GW27F2ANGN5O6BKVDBYTJLGAB3IZQC

Fix [2541331]: monster blinking only looked to the southeast.

Also fix a subtle bug causing monsters to be able to teleport through walls if there was clear rock there too. (This is because num_feats_between() is not symmetrical in its first two arguments.)

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

Created by haranp on January 29, 2009

FBVU7IUFVPEVV5ON6PWJWJ7GW27F2ANGN5O6BKVDBYTJLGAB3IZQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 2922 [6.16817]

B:BD[4.35218] → [5.7102:7227]

                    if (x_p + realx >= 0 && x_p + realx < 80
                        && y_p + realy >= 0 && y_p + realy < 70

[4.35218]

[7.1523]

                    if (x_p + realx >= 0 && x_p + realx < GXM
                        && y_p + realy >= 0 && y_p + realy < GYM

Insertion in crawl-ref/source/monstuff.cc at line 2114 [6.1396662]
[3.3149]
[3.3149]
```
    for (tries = 0; tries < 150; ++tries)
```

Replacement in crawl-ref/source/monstuff.cc at line 2117 [6.1396662]

B:BD[3.3155] → [3.3155:3286]

        // Save LOS, because we're going to clobber it with monster LOS.
        unwind_var<env_show_grid> visible_grid(env.show);

[3.3155]

[6.1428741]

        const coord_def delta(random2(13) - 6, random2(13) - 6);

Replacement in crawl-ref/source/monstuff.cc at line 2119 [6.1396662]

B:BD[6.1428742] → [3.3287:3366]

        // Do the clobbering.
        losight(env.show, grd, mon.pos(), true);

[6.1428742]

[8.5860]

        // Check that we don't get something too close to the
        // starting point.
        if (delta.origin())
            continue;

Replacement in crawl-ref/source/monstuff.cc at line 2124 [6.1396662]
B:BD[8.5861] → [3.3367:3413]
∅:D[9.2634] → [10.6525:6535]
∅:D[3.3413] → [10.6525:6535]
∅:D[11.3902] → [10.6525:6535]
B:BD[12.2788] → [10.6525:6535]
B:BD[10.6535] → [3.3414:3475]
```
        for (tries = 0; tries < 150; ++tries)
        {
            const coord_def delta(random2(14), random2(14));
```
[8.5861]
[3.3475]
```
        if (delta.rdist() == 1 && !allow_adjacent)
            continue;
```

Replacement in crawl-ref/source/monstuff.cc at line 2127 [6.1396662]

B:BD[3.3476] → [3.3476:3631]

            // Check that we don't get something too close to the
            // starting point.
            if (delta.origin())
                continue;

[3.3476]

[3.3631]

        // Update target.
        target = delta + mon.pos();

Replacement in crawl-ref/source/monstuff.cc at line 2130 [6.1396662]

B:BD[3.3632] → [3.3632:3713]

            if (delta.rdist() == 1 && !allow_adjacent)
                continue;

[3.3632]

[3.3713]

        // Check that the target is valid and survivable.
        if (!in_bounds(target))
            continue;

Replacement in crawl-ref/source/monstuff.cc at line 2134 [6.1396662]

B:BD[3.3714] → [3.3714:3784]

            // Update target.
            target = delta + mon.pos();

[3.3714]

[3.3784]

        if (!monster_habitable_grid(&mon, grd(target)))
            continue;

Replacement in crawl-ref/source/monstuff.cc at line 2137 [6.1396662]

B:BD[3.3785] → [3.3785:3909]

            // Check that the target is valid and survivable.
            if (!in_bounds(target))
                continue;

[3.3785]

[3.3909]

        if (respect_sanctuary && is_sanctuary(target))
            continue;

Replacement in crawl-ref/source/monstuff.cc at line 2140 [6.1396662]

B:BD[3.3910] → [3.3910:3996]

            if (!monster_habitable_grid(&mon, grd(target)))
                continue;

[3.3910]

[3.3996]

        if (target == you.pos())
            continue;

Replacement in crawl-ref/source/monstuff.cc at line 2143 [6.1396662]

B:BD[3.3997] → [3.3997:4418]

            if (respect_sanctuary && is_sanctuary(target))
                continue;
            // Check that we didn't go through clear walls.
            if (num_feats_between(target, mon.pos(),
                                  DNGN_CLEAR_ROCK_WALL,
                                  DNGN_CLEAR_PERMAROCK_WALL,
                                  true, true) > 0)
            {
                continue;
            }

[3.3997]

[3.4418]

        // Check that we didn't go through clear walls.
        if (num_feats_between(mon.pos(), target,
                              DNGN_CLEAR_ROCK_WALL,
                              DNGN_CLEAR_PERMAROCK_WALL,
                              true, true) > 0)
        {
            continue;
        }

Replacement in crawl-ref/source/monstuff.cc at line 2152 [6.1396662]

B:BD[3.4419] → [3.4419:4549]

            // Note that this uses the clobbered LOS!
            if (respect_los && !see_grid(target))
                continue;

[3.4419]

[3.4549]

        if (respect_los && !mon.mon_see_grid(target))
            continue;

Replacement in crawl-ref/source/monstuff.cc at line 2155 [6.1396662]

B:BD[3.4550] → [3.4550:4646]

∅:D[3.4646] → [10.6536:6546]

B:BD[12.2816] → [10.6536:6546]

            // Survived everything, break out (with a good value of target.)
            break;
        }

[3.4550]

[12.2816]

        // Survived everything, break out (with a good value of target.)
        break;

Replacement in crawl-ref/source/monstuff.cc at line 2195 [6.1396662]
B:BD[13.8434] → [13.8434:8470]
```
    FixedArray<bool, 14, 14> tried;
```
[13.8434]
[13.8470]
```
    FixedArray<bool, 13, 13> tried;
```
Replacement in crawl-ref/source/monstuff.cc at line 2214 [6.1396662]
B:BD[6.1429295] → [2.2487:2538]
```
        coord_def delta(random2(14), random2(14));
```
[6.1429295]
[13.9098]
```
        coord_def delta(random2(13), random2(13));
```