fiddlerwoaroof/crawl - Change 4DVSA4UKEO3B44LGKGQYIIP2YF2A33ACY2TMO7CNGUBML6REPCYAC

Use random_in_bounds() in another place, and, for paranoia's sake, check

that monsters don't run off the grid instead of the map.

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

Created by dolorous on January 26, 2009

4DVSA4UKEO3B44LGKGQYIIP2YF2A33ACY2TMO7CNGUBML6REPCYAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 4603 [3.1396662]

B:BD[3.1466076] → [4.8127:8199]

    // Bounds check: don't let fleeing monsters try to run off the map.

[3.1466076]

[5.48242]

    // Bounds check: don't let fleeing monsters try to run off the grid.

Replacement in crawl-ref/source/monstuff.cc at line 4605 [3.1396662]
B:BD[5.48290] → [2.3143:3171]
```
    if (!map_bounds_x(s.x))
```
[5.48290]
[6.26982]
```
    if (!in_bounds_x(s.x))
```
Replacement in crawl-ref/source/monstuff.cc at line 4607 [3.1396662]
B:BD[6.27002] → [2.3172:3200]
```
    if (!map_bounds_y(s.y))
```
[6.27002]
[6.27080]
```
    if (!in_bounds_y(s.y))
```
Replacement in crawl-ref/source/monstuff.cc at line 7148 [3.1396662]
B:BD[7.8429] → [7.8429:8461]
```
                // off the map.
```
[7.8429]
[5.50834]
```
                // off the grid.
```
Replacement in crawl-ref/source/monstuff.cc at line 7150 [3.1396662]
B:BD[5.50893] → [2.3201:3241]
```
                if (!map_bounds_x(s.x))
```
[5.50893]
[6.28665]
```
                if (!in_bounds_x(s.x))
```
Replacement in crawl-ref/source/monstuff.cc at line 7152 [3.1396662]
B:BD[6.28697] → [2.3242:3282]
```
                if (!map_bounds_y(s.y))
```
[6.28697]
[6.28773]
```
                if (!in_bounds_y(s.y))
```

Replacement in crawl-ref/source/effects.cc at line 3464 [3.3382105]

B:BD[8.3435] → [8.3435:3503]

    const bool long_time  = (range >= (500 + roll_dice( 2, 500 )));

[8.3435]

[8.3503]

    const bool long_time = (range >= (500 + roll_dice( 2, 500 )));

Replacement in crawl-ref/source/effects.cc at line 3492 [3.3382105]

B:BD[8.4347] → [5.69883:69960]

            mon->target.set(10 + random2(GXM - 10), 10 + random2(GYM - 10));

[8.4347]

[8.4457]

            mon->target = random_in_bounds();

Insertion in crawl-ref/source/effects.cc at line 3566 [3.3382105]
[8.6709]
[8.6709]
```
        {
```
Insertion in crawl-ref/source/effects.cc at line 3568 [3.3382105]
[8.6728]
[8.6728]
```
        }
```

Replacement in crawl-ref/source/effects.cc at line 3573 [3.3382105]

B:BD[8.6756] → [5.70414:70492]

    if (!shift_monster( mon, pos ))
        shift_monster( mon, mon->pos() );

[8.6756]

[8.6847]

    if (!shift_monster(mon, pos))
        shift_monster(mon, mon->pos());