fiddlerwoaroof/crawl - Change ZX4PRBKWDEXUQIWAZVNTSZHNYQSMS4KZEL7DB567K6HQUQJ3LVLQC

Properly do bounds checks in _catchup_monster_moves(). After a short

time between levels, monsters with ranged attacks were shifting their target without checking it afterwards with in_bounds(), and all monsters were later making their "dirt simple movement" and checking it with the equivalent of map_bounds() instead of in_bounds(). I believe this should finally fix [2488905].

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

Created by dolorous on January 26, 2009

ZX4PRBKWDEXUQIWAZVNTSZHNYQSMS4KZEL7DB567K6HQUQJ3LVLQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/effects.cc at line 3521 [4.3382105]

[3.5495]

[2.2885]

                    coord_def mshift(random2(3) - 1, random2(3) - 1);
                    // Bounds check: don't let fleeing monsters try to
                    // run off the grid.
                    const coord_def s = mon->target + mshift;
                    if (!in_bounds_x(s.x))
                        mshift.x = 0;
                    if (!in_bounds_y(s.y))
                        mshift.y = 0;

Replacement in crawl-ref/source/effects.cc at line 3533 [4.3382105]

∅:D[2.2984] → [5.70108:70218]

B:BD[6.4633] → [5.70108:70218]

                    mon->target.x += (random2(3) - 1);
                    mon->target.y += (random2(3) - 1);

[2.2984]

[3.5680]

                    mon->target.x += mshift.x;
                    mon->target.y += mshift.y;

Replacement in crawl-ref/source/effects.cc at line 3556 [4.3382105]
∅:D[2.3101] → [3.6054:6083]
B:BD[3.6054] → [3.6054:6083]
```
    // dirt simple movement:
```
[2.3101]
[2.3102]
```
    // Dirt simple movement.
```

Replacement in crawl-ref/source/effects.cc at line 3565 [4.3382105]

B:BD[3.6287] → [3.6287:6342]

        if (pos.x + inc.x < 0 || pos.x + inc.x >= GXM)

[3.6287]

[3.6342]

        // Bounds check: don't let shifting monsters try to run off the
        // grid.
        const coord_def s = pos + inc;
        if (!in_bounds_x(s.x))

Replacement in crawl-ref/source/effects.cc at line 3570 [4.3382105]
B:BD[3.6366] → [3.6366:6421]
```
        if (pos.y + inc.y < 0 || pos.y + inc.y >= GYM)
```
[3.6365]
[3.6421]
```
        if (!in_bounds_y(s.y))
```